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 2012/06/21 12:19:25 UTC
svn commit: r1352488 -
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/RootImpl.java
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