jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
Subject svn commit: r1309438 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStateEditor.java
Date Wed, 04 Apr 2012 15:02:36 GMT
Author: mduerig
Date: Wed Apr  4 15:02:36 2012
New Revision: 1309438

URL: http://svn.apache.org/viewvc?rev=1309438&view=rev
Log:
OAK-9: Internal tree builder
fix: mixed up revision and path

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

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStateEditor.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStateEditor.java?rev=1309438&r1=1309437&r2=1309438&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStateEditor.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStateEditor.java
Wed Apr  4 15:02:36 2012
@@ -164,8 +164,8 @@ public class KernelNodeStateEditor imple
      * @return node state resulting from merging
      */
     NodeState mergeInto(MicroKernel microkernel, KernelNodeState target) {
-        String targetPath = target.getRevision();
-        String targetRevision = target.getPath();
+        String targetPath = target.getPath();
+        String targetRevision = target.getRevision();
         String rev = microkernel.commit(targetPath, jsop.toString(), targetRevision, null);
         return new KernelNodeState(microkernel, targetPath, rev);
     }



Mime
View raw message