jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r1355073 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStoreBranch.java
Date Thu, 28 Jun 2012 16:48:32 GMT
Author: jukka
Date: Thu Jun 28 16:48:31 2012
New Revision: 1355073

URL: http://svn.apache.org/viewvc?rev=1355073&view=rev
Log:
OAK-157: Incorrect rebase/edit/merge logic

Remove the potentially infinite loop.

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStoreBranch.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStoreBranch.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStoreBranch.java?rev=1355073&r1=1355072&r2=1355073&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStoreBranch.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStoreBranch.java
Thu Jun 28 16:48:31 2012
@@ -125,14 +125,9 @@ class KernelNodeStoreBranch implements N
         MicroKernel kernel = store.getKernel();
         CommitEditor editor = store.getCommitEditor();
 
-        NodeState preMergeRoot = store.getRoot();
-        NodeState oldRoot = preMergeRoot;
+        NodeState oldRoot = store.getRoot();
         NodeState toCommit = editor.editCommit(store, oldRoot, currentRoot);
-        while (!currentRoot.equals(toCommit)) {
-            setRoot(toCommit);
-            oldRoot = store.getRoot();
-            toCommit = editor.editCommit(store, oldRoot, currentRoot);
-        }
+        setRoot(toCommit);
 
         try {
             String mergedRevision = kernel.merge(branchRevision, null);



Mime
View raw message