jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject svn commit: r1350147 - in /jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk: model/CommitBuilder.java store/RevisionStore.java
Date Thu, 14 Jun 2012 09:22:55 GMT
Author: stefan
Date: Thu Jun 14 09:22:54 2012
New Revision: 1350147

URL: http://svn.apache.org/viewvc?rev=1350147&view=rev
Log:
OAK-130: Unexpected result of MicroKernel#getJournal after MicroKernel#merge

Modified:
    jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/CommitBuilder.java
    jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/store/RevisionStore.java

Modified: jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/CommitBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/CommitBuilder.java?rev=1350147&r1=1350146&r2=1350147&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/CommitBuilder.java
(original)
+++ jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/CommitBuilder.java
Thu Jun 14 09:22:54 2012
@@ -225,7 +225,10 @@ public class CommitBuilder {
             newCommit.setCommitTS(System.currentTimeMillis());
             newCommit.setMsg(msg);
             // dynamically build diff of merged commit
-            String diff = new DiffBuilder(store.getNodeState(theirRoot), store.getNodeState(ourRoot),
"/", store, "").build();
+            String diff = new DiffBuilder(
+                    store.getNodeState(theirRoot),
+                    store.getNodeState(store.getNode(rootNodeId)),
+                    "/", store, "").build();
             newCommit.setChanges(diff);
             newCommit.setRootNodeId(rootNodeId);
             newCommit.setBranchRootId(null);

Modified: jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/store/RevisionStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/store/RevisionStore.java?rev=1350147&r1=1350146&r2=1350147&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/store/RevisionStore.java
(original)
+++ jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/store/RevisionStore.java
Thu Jun 14 09:22:54 2012
@@ -48,7 +48,7 @@ public interface RevisionStore extends R
     /**
      * Lock the head. Must be called prior to putting a new head commit.
      * 
-     * @see #putHeadCommit(MutableCommit)
+     * @see #putHeadCommit(PutToken, MutableCommit, Id)
      * @see #unlockHead()
      */
     void lockHead();



Mime
View raw message