svn commit: r1469277 - in /jackrabbit/oak/trunk/oak-core/src: main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java test/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilderTest.java

[jukka]

Author: jukka
Date: Thu Apr 18 11:00:33 2013
New Revision: 1469277

URL: http://svn.apache.org/r1469277
Log:
OAK-782: MemoryNodeBuilder.setNode() loses property values

The base state of MutableNodeStates should follow that of the parent writeState 
instead of the base state of the parent builder.

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java
    
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilderTest.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=1469277&r1=1469276&r2=1469277&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 18 11:00:33 2013
@@ -254,7 +254,9 @@ public class MemoryNodeBuilder implement
             writeState = parent.getWriteState(name);
             if (writeState == null) {
                 if (exists()) {
-                    writeState = new MutableNodeState(baseState);
+                    NodeState writeBase =
+                            parent.writeState.base.getChildNode(name);
+                    writeState = new MutableNodeState(writeBase);
                 }
                 else {
                     writeState = new MutableNodeState(null);

Modified: 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilderTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilderTest.java?rev=1469277&r1=1469276&r2=1469277&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilderTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilderTest.java
 Thu Apr 18 11:00:33 2013
@@ -198,7 +198,6 @@ public class MemoryNodeBuilderTest {
     }
 
     @Test
-    @Ignore("OAK-782")
     public void setNodeTest() {
         MemoryNodeBuilder rootBuilder = new 
MemoryNodeBuilder(EmptyNodeState.EMPTY_NODE);
         rootBuilder.setNode("a", createBC(true));