svn commit: r1607136 - in /jackrabbit/oak/branches/1.0: ./ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeState.java

[alexparvulescu]

Author: alexparvulescu
Date: Tue Jul  1 16:36:58 2014
New Revision: 1607136

URL: http://svn.apache.org/r1607136
Log:
OAK-1936 TarMK compaction map check should switch comparison sides
 merged revision 1607127


Modified:
    jackrabbit/oak/branches/1.0/   (props changed)
    
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeState.java

Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
  Merged /jackrabbit/oak/trunk:r1607127

Modified: 
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeState.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeState.java?rev=1607136&r1=1607135&r2=1607136&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeState.java
 (original)
+++ 
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeState.java
 Tue Jul  1 16:36:58 2014
@@ -390,7 +390,7 @@ public class SegmentNodeState extends Re
         }
 
         SegmentNodeState that = (SegmentNodeState) base;
-        if (wasCompactedTo(that)) {
+        if (that.wasCompactedTo(this)) {
             return true; // no changes during compaction
         }