Author: mreutegg
Date: Tue Aug 25 12:06:46 2015
New Revision: 1697657
URL: http://svn.apache.org/r1697657
Log:
OAK-3163: Improve binary comparison during repeated upgrades
Applied patch provided by Julian Sedding.
Modified:
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java
Modified:
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java?rev=1697657&r1=1697656&r2=1697657&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java
(original)
+++
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java
Tue Aug 25 12:06:46 2015
@@ -603,6 +603,7 @@ class JackrabbitNodeState extends Abstra
return 0;
}
}
+
@Nonnull
@Override
public InputStream getNewStream() {
@@ -613,6 +614,7 @@ class JackrabbitNodeState extends Abstra
return new ByteArrayInputStream(new byte[0]);
}
}
+
@Override
public String getReference() {
if (!useBinaryReferences) {
@@ -634,6 +636,22 @@ class JackrabbitNodeState extends Abstra
return null;
}
}
+
+ @Override
+ public String getContentIdentity() {
+ final String reference = getReference();
+ if (reference != null) {
+ final int pos = reference.indexOf(":");
+ final String blobHash;
+ if (pos > -1) {
+ blobHash = reference.substring(0, pos);
+ } else {
+ blobHash = reference;
+ }
+ return blobHash + "#" + length();
+ }
+ return super.getContentIdentity();
+ }
};
}
