You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by md...@apache.org on 2013/04/01 15:47:37 UTC
svn commit: r1463135 -
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/RootImpl.java
Author: mduerig
Date: Mon Apr 1 13:47:37 2013
New Revision: 1463135
URL: http://svn.apache.org/r1463135
Log:
OAK-690: Enforce and clarify Root contract wrt. invalid Tree instances
make rootTree member final
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=1463135&r1=1463134&r2=1463135&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 Apr 1 13:47:37 2013
@@ -77,10 +77,10 @@ public class RootImpl implements Root {
*/
private final NodeStore store;
- private final String workspaceName;
-
private final CommitHook hook;
+ private final String workspaceName;
+
private final Subject subject;
private final SecurityProvider securityProvider;
@@ -88,6 +88,11 @@ public class RootImpl implements Root {
private final QueryIndexProvider indexProvider;
/**
+ * Current root {@code Tree}
+ */
+ private final TreeImpl rootTree;
+
+ /**
* Current branch this root operates on
*/
private NodeStoreBranch branch;
@@ -96,11 +101,6 @@ public class RootImpl implements Root {
private Move lastMove = new Move();
/**
- * Current root {@code Tree}
- */
- private TreeImpl rootTree;
-
- /**
* Number of {@link #updated} occurred so since the last
* purge.
*/