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 an...@apache.org on 2017/12/12 10:31:23 UTC
svn commit: r1817902 -
/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderBuilder.java
Author: angela
Date: Tue Dec 12 10:31:23 2017
New Revision: 1817902
URL: http://svn.apache.org/viewvc?rev=1817902&view=rev
Log:
OAK-7049 : SecurityProviderBuilder : pass Root/TreeProvider to SecurityConfigurations
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderBuilder.java
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderBuilder.java?rev=1817902&r1=1817901&r2=1817902&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderBuilder.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderBuilder.java Tue Dec 12 10:31:23 2017
@@ -58,13 +58,16 @@ public class SecurityProviderBuilder {
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);
}