You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by al...@apache.org on 2014/11/09 12:19:34 UTC
svn commit: r1637653 - in /jackrabbit/oak/branches/1.0: ./
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentBlob.java
Author: alexparvulescu
Date: Sun Nov 9 11:19:34 2014
New Revision: 1637653
URL: http://svn.apache.org/r1637653
Log:
OAK-2259 SegmentBlob equals check should verify compaction in both directions
- merged rev 1637382
Modified:
jackrabbit/oak/branches/1.0/ (props changed)
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentBlob.java
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk:r1637382
Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentBlob.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentBlob.java?rev=1637653&r1=1637652&r2=1637653&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentBlob.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentBlob.java Sun Nov 9 11:19:34 2014
@@ -191,13 +191,14 @@ public class SegmentBlob extends Record
public boolean equals(Object object) {
if (object == this || fastEquals(this, object)) {
return true;
- } else if (object instanceof SegmentBlob
- && wasCompactedTo((SegmentBlob) object)) {
- return true;
- } else {
- return object instanceof Blob
- && AbstractBlob.equal(this, (Blob) object);
+ } else if (object instanceof SegmentBlob) {
+ SegmentBlob that = (SegmentBlob) object;
+ if (this.wasCompactedTo(that) || that.wasCompactedTo(this)) {
+ return true;
+ }
}
+ return object instanceof Blob
+ && AbstractBlob.equal(this, (Blob) object);
}
@Override