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/20 17:57:43 UTC
svn commit: r1352177 -
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStoreBranch.java
Author: mduerig
Date: Wed Jun 20 15:57:43 2012
New Revision: 1352177
URL: http://svn.apache.org/viewvc?rev=1352177&view=rev
Log:
OAK-146: Wrong value passed to before parameter of CommitHook.afterCommit in KernelNodeStore.merge
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=1352177&r1=1352176&r2=1352177&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 Wed Jun 20 15:57:43 2012
@@ -125,7 +125,8 @@ class KernelNodeStoreBranch implements N
MicroKernel kernel = store.getKernel();
CommitHook commitHook = store.getCommitHook();
- NodeState oldRoot = store.getRoot();
+ NodeState preMergeRoot = store.getRoot();
+ NodeState oldRoot = preMergeRoot;
NodeState toCommit = commitHook.beforeCommit(store, oldRoot, currentRoot);
while (!currentRoot.equals(toCommit)) {
setRoot(toCommit);
@@ -139,7 +140,7 @@ class KernelNodeStoreBranch implements N
currentRoot = null;
committed = null;
KernelNodeState committed = new KernelNodeState(kernel, getValueFactory(), "/", mergedRevision);
- commitHook.afterCommit(store, oldRoot, committed);
+ commitHook.afterCommit(store, preMergeRoot, committed);
return committed;
}
catch (MicroKernelException e) {