motiejus
/
jgit
1
Fork 0
Code Releases Activity

dfs: Fix build break caused by DfsStreamKey.of signature change 

Change-Id: I6c49cf42a04dd0d96cfe0751f500a51f56f0bdb8
This commit is contained in:
Shawn Pearce 2017-07-19 09:32:00 -07:00
parent 4321ccd468
commit 8d27c480df
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DeltaBaseCacheTest.java
View File

@ -63,7 +63,8 @@ public class DeltaBaseCacheTest {
@Before
public void setUp() {
key = DfsStreamKey.of("test.key");
DfsRepositoryDescription repo = new DfsRepositoryDescription("test");
key = DfsStreamKey.of(repo, "test.key");
cache = new DeltaBaseCache(SZ);
rng = new TestRng(getClass().getSimpleName());
}

5
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCache.java
View File

@ -178,7 +178,10 @@ private DfsBlockCache(final DfsBlockCacheConfig cfg) {
blockSizeShift = Integer.numberOfTrailingZeros(blockSize);
clockLock = new ReentrantLock(true /* fair */);
clockHand = new Ref<>(DfsStreamKey.of(""), -1, 0, null); //$NON-NLS-1$
String none = ""; //$NON-NLS-1$
clockHand = new Ref<>(
DfsStreamKey.of(new DfsRepositoryDescription(none), none),
-1, 0, null);
clockHand.next = clockHand;
statHit = new AtomicLong();