summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn Pearce <spearce@spearce.org>2017-07-19 10:04:09 -0700
committerShawn Pearce <spearce@spearce.org>2017-07-19 10:04:09 -0700
commita6afed9bb894bb885e4c45252a2193de81efb871 (patch)
treeceef626b875858ea095cc2c19cee3377f9e15f4c
parent8d27c480df6291307350d26d897e81886fcd4e43 (diff)
downloadjgit-a6afed9bb894bb885e4c45252a2193de81efb871.tar.gz
jgit-a6afed9bb894bb885e4c45252a2193de81efb871.zip
dfs: Fix incorrect use of reference == for DfsStreamKey
Must use .equals() now with DfsStreamKey. Change-Id: I35fecbe3895c2078d69213e9c708a9b0613a1c7c
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlock.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlock.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlock.java
index 6667c2fc23..dae922eb4c 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlock.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlock.java
@@ -74,7 +74,7 @@ final class DfsBlock {
}
boolean contains(DfsStreamKey want, long pos) {
- return stream == want && start <= pos && pos < end;
+ return stream.equals(want) && start <= pos && pos < end;
}
int copy(long pos, byte[] dstbuf, int dstoff, int cnt) {