jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
Subject svn commit: r1508052 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/RootImpl.java
Date Mon, 29 Jul 2013 13:32:34 GMT
Author: mduerig
Date: Mon Jul 29 13:32:34 2013
New Revision: 1508052

URL: http://svn.apache.org/r1508052
Log:
OAK-927 Concurrent commits may cause duplicate observation events
remove unused local variables

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=1508052&r1=1508051&r2=1508052&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
Mon Jul 29 13:32:34 2013
@@ -91,19 +91,19 @@ public class RootImpl implements Root {
     private final MutableTree rootTree;
 
     /**
-     * Current branch this root operates on
+     * Secured builder for the root tree
      */
-    private NodeStoreBranch branch;
+    private final SecureNodeBuilder secureBuilder;
 
     /**
      * Unsecured builder for the root tree
      */
-    private NodeBuilder builder;
+    private final NodeBuilder builder;
 
     /**
-     * Secured builder for the root tree
+     * Current branch this root operates on
      */
-    private SecureNodeBuilder secureBuilder;
+    private NodeStoreBranch branch;
 
     /**
      * Sentinel for the next move operation to take place on the this root
@@ -248,8 +248,7 @@ public class RootImpl implements Root {
             @Override
             public CommitFailedException run() {
                 try {
-                    NodeState base = branch.getBase();
-                    NodeState newHead = branch.merge(getCommitHook(), postHook);
+                    branch.merge(getCommitHook(), postHook);
                     return null;
                 } catch (CommitFailedException e) {
                     return e;



Mime
View raw message