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 2012/07/31 10:49:06 UTC

svn commit: r1367465 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeEditor.java

Author: alexparvulescu
Date: Tue Jul 31 08:49:06 2012
New Revision: 1367465

URL: http://svn.apache.org/viewvc?rev=1367465&view=rev
Log:
OAK-211 CompositeEditor should keep the base node state stable

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeEditor.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeEditor.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeEditor.java?rev=1367465&r1=1367464&r2=1367465&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeEditor.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeEditor.java Tue Jul 31 08:49:06 2012
@@ -45,12 +45,9 @@ public class CompositeEditor implements 
             NodeStore store, NodeState before, NodeState after)
             throws CommitFailedException {
 
-        NodeState oldState = before;
         NodeState newState = after;
         for (CommitEditor editor : editors) {
-            NodeState newOldState = newState;
-            newState = editor.editCommit(store, oldState, newState);
-            oldState = newOldState;
+            newState = editor.editCommit(store, before, newState);
         }
 
         return newState;