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

[mduerig]

Author: mduerig
Date: Wed Nov 13 17:26:30 2013
New Revision: 1541626

URL: http://svn.apache.org/r1541626
Log:
OAK-1178: MutableTree#isNew: replace implementation by NodeBuilder#isNew

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/kernel/KernelNodeBuilderTest.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=1541626&r1=1541625&r2=1541626&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
 Wed Nov 13 17:26:30 2013
@@ -260,7 +260,7 @@ public class MemoryNodeBuilder implement
 
     @Override
     public boolean isNew() {
-        return !isRoot() && !parent.base().hasChildNode(name) && 
parent.hasChildNode(name);
+        return exists() && !base.exists();
     }
 
     @Override

Modified: 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/kernel/KernelNodeBuilderTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/kernel/KernelNodeBuilderTest.java?rev=1541626&r1=1541625&r2=1541626&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/kernel/KernelNodeBuilderTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/kernel/KernelNodeBuilderTest.java
 Wed Nov 13 17:26:30 2013
@@ -28,7 +28,6 @@ import org.apache.jackrabbit.oak.plugins
 import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
 import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
 import org.apache.jackrabbit.oak.spi.state.NodeStore;
-import org.junit.Ignore;
 import org.junit.Test;
 
 public class KernelNodeBuilderTest {
@@ -48,8 +47,7 @@ public class KernelNodeBuilderTest {
     }
 
     @Test
-    @Ignore("OAK-1178")  // FIXME OAK-1178
-    public void rebasePreservesStatus() {
+    public void rebasePreservesNew() {
         NodeStore store = new KernelNodeStore(new MicroKernelImpl());
         NodeBuilder root = store.getRoot().builder();
         NodeBuilder added = root.setChildNode("added");