svn commit: r1799402 - /jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStore.java

[tomekr]

Author: tomekr
Date: Wed Jun 21 08:39:21 2017
New Revision: 1799402

URL: http://svn.apache.org/viewvc?rev=1799402&view=rev
Log:
OAK-6376: Race condition in the CompositeNodeStore#merge

Modified:
    
jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStore.java

Modified: 
jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStore.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStore.java?rev=1799402&r1=1799401&r2=1799402&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStore.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStore.java
 Wed Jun 21 08:39:21 2017
@@ -131,8 +131,9 @@ public class CompositeNodeStore implemen
         }
 
         // run commit hooks and apply the changes to the builder instance
-        NodeState processed = commitHook.processCommit(getRoot(), 
rebase(nodeBuilder), info);
-        processed.compareAgainstBaseState(builder.getNodeState(), new 
ApplyDiff(nodeBuilder));
+        NodeState rebased = rebase(nodeBuilder);
+        NodeState processed = 
commitHook.processCommit(nodeBuilder.getBaseState(), rebased, info);
+        processed.compareAgainstBaseState(rebased, new ApplyDiff(nodeBuilder));
 
         assertNoChangesOnReadOnlyMounts(nodeBuilder);