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 md...@apache.org on 2016/06/08 13:17:20 UTC

svn commit: r1747391 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/MergingNodeStateDiff.java

Author: mduerig
Date: Wed Jun  8 13:17:20 2016
New Revision: 1747391

URL: http://svn.apache.org/viewvc?rev=1747391&view=rev
Log:
OAK-4444: Reduce number of calls to NodeBuilder.getNodeState from MergingNodeStateDiff
Only call getNodeState at the root of the diff

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/MergingNodeStateDiff.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/MergingNodeStateDiff.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/MergingNodeStateDiff.java?rev=1747391&r1=1747390&r2=1747391&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/MergingNodeStateDiff.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/MergingNodeStateDiff.java Wed Jun  8 13:17:20 2016
@@ -62,15 +62,15 @@ public final class MergingNodeStateDiff
     }
 
     static NodeState merge(NodeState fromState, NodeState toState, ConflictHandler conflictHandler) {
-        return merge(fromState, toState, toState.builder(), conflictHandler);
+        return merge(fromState, toState, toState.builder(), conflictHandler).getNodeState();
     }
 
-    private static NodeState merge(NodeState fromState, NodeState toState, NodeBuilder target,
-            ConflictHandler conflictHandler) {
+    private static NodeBuilder merge(NodeState fromState, NodeState toState, NodeBuilder target,
+                                     ConflictHandler conflictHandler) {
         toState.compareAgainstBaseState(fromState,
                 new MergingNodeStateDiff(toState, target, conflictHandler));
 
-        return target.getNodeState();
+        return target;
     }
 
     //------------------------------------------------------< NodeStateDiff >---