You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by mr...@apache.org on 2019/10/21 13:57:12 UTC
svn commit: r1868708 - in /jackrabbit/oak/trunk/oak-store-document/src: main/java/org/apache/jackrabbit/oak/plugins/document/ test/java/org/apache/jackrabbit/oak/plugins/document/

Author: mreutegg
Date: Mon Oct 21 13:57:11 2019
New Revision: 1868708

URL: http://svn.apache.org/viewvc?rev=1868708&view=rev
Log:
OAK-8691: Incorrect base state from node builder

Apply fix and enable test

Modified:
    jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentRootBuilder.java
    jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ModifiedDocumentNodeState.java
    jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeBuilderTest.java

Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentRootBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentRootBuilder.java?rev=1868708&r1=1868707&r2=1868708&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentRootBuilder.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentRootBuilder.java Mon Oct 21 13:57:11 2019
@@ -70,7 +70,7 @@ class DocumentRootBuilder extends Abstra
      */
     private int updates;
 
-    DocumentRootBuilder(@NotNull DocumentNodeState base,
+    DocumentRootBuilder(@NotNull NodeState base,
                         @NotNull DocumentNodeStore store,
                         @NotNull DocumentNodeStoreBranch branch) {
         super(checkNotNull(base));

Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ModifiedDocumentNodeState.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ModifiedDocumentNodeState.java?rev=1868708&r1=1868707&r2=1868708&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ModifiedDocumentNodeState.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ModifiedDocumentNodeState.java Mon Oct 21 13:57:11 2019
@@ -20,7 +20,6 @@ import org.apache.jackrabbit.oak.api.Pro
 import org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState;
 import org.apache.jackrabbit.oak.plugins.memory.ModifiedNodeState;
 import org.apache.jackrabbit.oak.spi.state.AbstractNodeState;
-import org.apache.jackrabbit.oak.spi.state.ApplyDiff;
 import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry;
 import org.apache.jackrabbit.oak.spi.state.EqualsDiff;
 import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
@@ -89,9 +88,7 @@ class ModifiedDocumentNodeState extends
     @NotNull
     @Override
     public NodeBuilder builder() {
-        NodeBuilder builder = new DocumentRootBuilder(base, store, branch);
-        modified.compareAgainstBaseState(base, new ApplyDiff(builder));
-        return builder;
+        return new DocumentRootBuilder(modified, store, branch);
     }
 
     @Override

Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeBuilderTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeBuilderTest.java?rev=1868708&r1=1868707&r2=1868708&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeBuilderTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeBuilderTest.java Mon Oct 21 13:57:11 2019
@@ -92,7 +92,6 @@ public class DocumentNodeBuilderTest {
         assertStateEquals(state, builder.getBaseState());
     }
 
-    @Ignore("OAK-8691")
     @Test
     public void getBaseStateFromBuilderFromStateFromModifiedBuilder() {
         NodeState state = ns.getRoot();