svn commit: r1584279 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java

[mr...@apache.org]

Author: mreutegg
Date: Thu Apr  3 08:23:03 2014
New Revision: 1584279

URL: http://svn.apache.org/r1584279
Log:
OAK-1670: ConnectedHead.update() passes current state on to Unconnected instead of base state

Apply proposed patch. Thanks Michi for the review!

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java?rev=1584279&r1=1584278&r2=1584279&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java Thu Apr  3 08:23:03 2014
@@ -703,7 +703,7 @@ public class MemoryNodeBuilder implement
                 // to unconnected and connect again if necessary.
                 // No need to pass base() instead of base as the subsequent
                 // call to update will take care of updating to the latest state.
-                builder.head = new UnconnectedHead(builder, state);
+                builder.head = new UnconnectedHead(builder, builder.base);
                 return builder.head.update();
             } else {
                 return this;