svn commit: r1490534 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/RootImpl.java

[md...@apache.org]

Author: mduerig
Date: Fri Jun  7 08:16:25 2013
New Revision: 1490534

URL: http://svn.apache.org/r1490534
Log:
OAK-709: Consider moving permission evaluation to the node state level
convert secureBuilder field to local since it is not used referenced from elsewhere

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=1490534&r1=1490533&r2=1490534&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 Fri Jun  7 08:16:25 2013
@@ -101,8 +101,10 @@ public class RootImpl implements Root {
      */
     private NodeStoreBranch branch;
 
-    private NodeBuilder rawBuilder;
-    private NodeBuilder secureBuilder;
+    /**
+     * Unsecured builder for the root tree
+     */
+    private NodeBuilder builder;
 
     /** Sentinel for the next move operation to take place on the this root */
     private Move lastMove = new Move();
@@ -142,8 +144,8 @@ public class RootImpl implements Root {
 
         branch = this.store.branch();
         NodeState root = branch.getHead();
-        rawBuilder = root.builder();
-        secureBuilder = new SecureNodeBuilder(rawBuilder, getRootContext(root));
+        builder = root.builder();
+        NodeBuilder secureBuilder = new SecureNodeBuilder(builder, getRootContext(root));
         rootTree = new TreeImpl(this, secureBuilder, lastMove);
     }
 
@@ -403,7 +405,7 @@ public class RootImpl implements Root {
      */
     @Nonnull
     private NodeState getRootState() {
-        return rawBuilder.getNodeState();
+        return builder.getNodeState();
     }
 
     /**
@@ -443,7 +445,7 @@ public class RootImpl implements Root {
      */
     private void reset() {
         NodeState root = branch.getHead();
-        rawBuilder.reset(root);
+        builder.reset(root);
     }
 
     @Nonnull