svn commit: r1822638 - in /jackrabbit/oak/trunk/oak-store-document/src: main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/DocumentBundlingTest.java

[mreutegg]

Author: mreutegg
Date: Tue Jan 30 13:00:40 2018
New Revision: 1822638

URL: http://svn.apache.org/viewvc?rev=1822638&view=rev
Log:
OAK-7213: Avoid call for child node when bundle contains all children

Modified:
    
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java
    
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/DocumentBundlingTest.java

Modified: 
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java?rev=1822638&r1=1822637&r2=1822638&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java
 Tue Jan 30 13:00:40 2018
@@ -502,6 +502,8 @@ public class DocumentNodeState extends A
             } else {
                 return null;
             }
+        } else if (bundlingContext.hasOnlyBundledChildren()) {
+            return null;
         }
 
         return store.getNode(concat(getPath(), childNodeName), lastRevision);

Modified: 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/DocumentBundlingTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/DocumentBundlingTest.java?rev=1822638&r1=1822637&r2=1822638&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/DocumentBundlingTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/DocumentBundlingTest.java
 Tue Jan 30 13:00:40 2018
@@ -61,7 +61,6 @@ import org.apache.jackrabbit.oak.spi.sta
 import org.apache.jackrabbit.oak.spi.state.NodeStateUtils;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -448,7 +447,6 @@ public class DocumentBundlingTest {
         assertEquals(1, ds.queryPaths.size());
     }
 
-    @Ignore("OAK-7213")
     @Test
     public void hasChildren_BundledRoot_NoNonBundledChild() throws Exception {
         createTestNode("/test/book.jpg", 
createChild(newNode("app:Asset")).getNodeState());