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

[mreutegg]

Author: mreutegg
Date: Thu Oct  3 14:21:43 2019
New Revision: 1867948

URL: http://svn.apache.org/viewvc?rev=1867948&view=rev
Log:
OAK-8667: Merge may fail when commit root is a bundled node

Apply fix and enable test

Modified:
    
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.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/Commit.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java?rev=1867948&r1=1867947&r2=1867948&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java
 Thu Oct  3 14:21:43 2019
@@ -335,6 +335,9 @@ public class Commit {
             }
         }
 
+        // adjust commit root when it falls on a bundled node
+        commitRootPath = bundledNodes.getOrDefault(commitRootPath, 
commitRootPath);
+
         rollback = new Rollback(revision, opLog,
                 Utils.getIdFromPath(commitRootPath),
                 nodeStore.getCreateOrUpdateBatchSize());

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=1867948&r1=1867947&r2=1867948&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
 Thu Oct  3 14:21:43 2019
@@ -64,7 +64,6 @@ import org.h2.mvstore.WriteBuffer;
 import org.jetbrains.annotations.NotNull;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -864,7 +863,6 @@ public class DocumentBundlingTest {
         return names;
     }
 
-    @Ignore("OAK-8667")
     @Test
     public void deleteDescendantNodesOfBundledNode() throws Exception {
         NodeBuilder builder = store.getRoot().builder();