Index: oak-core/src/test/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderBuilder.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-core/src/test/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderBuilder.java (revision 1817790) +++ oak-core/src/test/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderBuilder.java (revision ) @@ -58,12 +58,15 @@ if (!(cc instanceof CompositeConfiguration)) { throw new IllegalStateException(); } else { - if (sc instanceof ConfigurationBase) { - ((ConfigurationBase) sc).setSecurityProvider(sp); - } - CompositeConfiguration composite = (CompositeConfiguration) cc; SecurityConfiguration defConfig = composite.getDefaultConfig(); + + if (sc instanceof ConfigurationBase) { + ConfigurationBase cb = (ConfigurationBase) sc; + cb.setSecurityProvider(sp); + cb.setRootProvider(((ConfigurationBase) defConfig).getRootProvider()); + cb.setTreeProvider(((ConfigurationBase) defConfig).getTreeProvider()); + } composite.addConfiguration(sc); composite.addConfiguration(defConfig);