jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
Subject svn commit: r1352488 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/RootImpl.java
Date Thu, 21 Jun 2012 10:19:25 GMT
Author: mduerig
Date: Thu Jun 21 10:19:25 2012
New Revision: 1352488

URL: http://svn.apache.org/viewvc?rev=1352488&view=rev
Log:
OAK-146: Wrong value passed to before parameter of CommitHook.afterCommit in KernelNodeStore.merge
minor code refactor

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

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/RootImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/RootImpl.java?rev=1352488&r1=1352487&r2=1352488&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/RootImpl.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/RootImpl.java
Thu Jun 21 10:19:25 2012
@@ -145,9 +145,7 @@ public class RootImpl implements Root {
         purgePendingChanges();
         NodeState base = getBaseState();
         NodeState head = getCurrentRootState();
-        currentRootState = null;
-        branch = store.branch();
-        root = TreeImpl.createRoot(this);
+        refresh();
         merge(base, head, root, conflictHandler);
     }
 
@@ -163,8 +161,7 @@ public class RootImpl implements Root {
         rebase(conflictHandler);
         purgePendingChanges();
         branch.merge();
-        branch = store.branch();
-        root = TreeImpl.createRoot(this);
+        refresh();
     }
 
     @Override



Mime
View raw message