svn commit: r1585305 - in /jackrabbit/oak/trunk: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/ oak-core/src/test/java/org/apache/jackrabbit/oak/core/ oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/

[mduerig]

Author: mduerig
Date: Sun Apr  6 13:43:11 2014
New Revision: 1585305

URL: http://svn.apache.org/r1585305
Log:
OAK-1674: Node isNew() is false in case the node is removed and added in same 
commit
Treat a replaced builder as new, enable test cases

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/AbstractTree.java
    
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/MutableTreeTest.java
    
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/RepositoryTest.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/AbstractTree.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/AbstractTree.java?rev=1585305&r1=1585304&r2=1585305&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/AbstractTree.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/AbstractTree.java
 Sun Apr  6 13:43:11 2014
@@ -204,7 +204,7 @@ public abstract class AbstractTree imple
 
     @Override
     public Status getStatus() {
-        if (nodeBuilder.isNew()) {
+        if (nodeBuilder.isNew() || nodeBuilder.isReplaced()) {
             return NEW;
         } else if (nodeBuilder.isModified()) {
             return MODIFIED;

Modified: 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/MutableTreeTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/MutableTreeTest.java?rev=1585305&r1=1585304&r2=1585305&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/MutableTreeTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/MutableTreeTest.java
 Sun Apr  6 13:43:11 2014
@@ -45,7 +45,6 @@ import org.apache.jackrabbit.oak.plugins
 import org.apache.jackrabbit.oak.plugins.tree.TreeConstants;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -313,7 +312,6 @@ public class MutableTreeTest extends Oak
         assertFalse(y.exists());
     }
 
-    @Ignore("OAK-1674")  // FIXME OAK-1674
     @Test
     public void isNew() throws CommitFailedException {
         Tree tree = root.getTree("/");

Modified: 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/RepositoryTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/RepositoryTest.java?rev=1585305&r1=1585304&r2=1585305&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/RepositoryTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/RepositoryTest.java
 Sun Apr  6 13:43:11 2014
@@ -567,7 +567,6 @@ public class RepositoryTest extends Abst
         }
     }
 
-    @Ignore("OAK-1674")  // FIXME OAK-1674
     @Test
     public void testIsNew() throws RepositoryException, InterruptedException {
         Session session = getAdminSession();