Merge branch 'stable-7.3' into stable-7.4 * stable-7.3: Ensure the SnapshottingRefDirectory shares the packedRefsRefresher Change-Id: I76497ae2856163e900c8dedef889ad8137afd728
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java index 91f7b24..edeb700 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java
@@ -152,8 +152,7 @@ public class RefDirectory extends RefDatabase { /** Immutable sorted list of packed references. */ final AtomicReference<PackedRefList> packedRefs = new AtomicReference<>(); - private final AtomicReference<PackedRefsRefresher> packedRefsRefresher = - new AtomicReference<>(); + private final AtomicReference<PackedRefsRefresher> packedRefsRefresher; /** * Lock for coordinating operations within a single process that may contend @@ -202,6 +201,7 @@ public class RefDirectory extends RefDatabase { looseRefs.set(refDb.looseRefs.get()); packedRefs.set(refDb.packedRefs.get()); coreConfig = refDb.coreConfig; + packedRefsRefresher = refDb.packedRefsRefresher; inProcessPackedRefsLock = refDb.inProcessPackedRefsLock; } @@ -218,6 +218,7 @@ public class RefDirectory extends RefDatabase { looseRefs.set(RefList.<LooseRef> emptyList()); packedRefs.set(NO_PACKED_REFS); coreConfig = db.getConfig().get(CoreConfig.KEY); + packedRefsRefresher = new AtomicReference<>(); inProcessPackedRefsLock = new ReentrantLock(true); }