jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
Subject svn commit: r1405213 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java
Date Fri, 02 Nov 2012 23:15:02 GMT
Author: mduerig
Date: Fri Nov  2 23:15:01 2012
New Revision: 1405213

URL: http://svn.apache.org/viewvc?rev=1405213&view=rev
Log:
OAK-421: NodeBuilder.reset might lead to inconsistent builder

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java?rev=1405213&r1=1405212&r2=1405213&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java
Fri Nov  2 23:15:01 2012
@@ -265,7 +265,7 @@ public class MemoryNodeBuilder implement
         if (this == root) {
             baseState = checkNotNull(newBase);
             writeState = new MutableNodeState(baseState);
-            revision = 0;
+            revision += 2;  // Make sure we are ahead of the revisions of all other builders
root at this builder
         } else {
             throw new IllegalStateException("Cannot reset a non-root builder");
         }



Mime
View raw message