svn commit: r1833100 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeInitializer.java

[stillalex]

Author: stillalex
Date: Thu Jun  7 07:29:41 2018
New Revision: 1833100

URL: http://svn.apache.org/viewvc?rev=1833100&view=rev
Log:
OAK-7530 PrivilegeInitializer should not attempt to create jcr:system node


Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeInitializer.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeInitializer.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeInitializer.java?rev=1833100&r1=1833099&r2=1833100&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeInitializer.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeInitializer.java
 Thu Jun  7 07:29:41 2018
@@ -25,7 +25,6 @@ import org.apache.jackrabbit.oak.api.Typ
 import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore;
 import org.apache.jackrabbit.oak.plugins.tree.RootProvider;
 import org.apache.jackrabbit.oak.spi.lifecycle.RepositoryInitializer;
-import org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants;
 import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants;
 import org.apache.jackrabbit.oak.spi.state.ApplyDiff;
 import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
@@ -54,9 +53,10 @@ class PrivilegeInitializer implements Re
 
     @Override
     public void initialize(@Nonnull NodeBuilder builder) {
-        NodeBuilder system = builder.child(JcrConstants.JCR_SYSTEM);
-        system.setProperty(JcrConstants.JCR_PRIMARYTYPE, 
NodeTypeConstants.NT_REP_SYSTEM, Type.NAME);
-
+        if (!builder.hasChildNode(JcrConstants.JCR_SYSTEM)) {
+            throw new IllegalStateException("Missing " + 
JcrConstants.JCR_SYSTEM + " node, NodeStore not initialized.");
+        }
+        NodeBuilder system = builder.getChildNode(JcrConstants.JCR_SYSTEM);
         if (!system.hasChildNode(REP_PRIVILEGES)) {
             NodeBuilder privileges = system.child(REP_PRIVILEGES);
             privileges.setProperty(JcrConstants.JCR_PRIMARYTYPE, 
NT_REP_PRIVILEGES, Type.NAME);