Author: angela
Date: Wed Feb 5 17:54:39 2014
New Revision: 1564848
URL: http://svn.apache.org/r1564848
Log:
minor improvement
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionProviderImpl.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionProviderImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionProviderImpl.java?rev=1564848&r1=1564847&r2=1564848&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionProviderImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionProviderImpl.java
Wed Feb 5 17:54:39 2014
@@ -29,7 +29,6 @@ import org.apache.jackrabbit.oak.api.Tre
import org.apache.jackrabbit.oak.core.ImmutableRoot;
import org.apache.jackrabbit.oak.plugins.tree.ImmutableTree;
import org.apache.jackrabbit.oak.plugins.version.VersionConstants;
-import org.apache.jackrabbit.oak.spi.security.SecurityConfiguration;
import
org.apache.jackrabbit.oak.spi.security.authorization.AuthorizationConfiguration;
import
org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol.AccessControlConstants;
import
org.apache.jackrabbit.oak.spi.security.authorization.permission.PermissionConstants;
@@ -63,7 +62,7 @@ public class PermissionProviderImpl impl
this.workspaceName = workspaceName;
this.acConfig = acConfig;
- immutableRoot = getImmutableRoot(root, acConfig);
+ immutableRoot = getImmutableRoot(root);
if (principals.contains(SystemPrincipal.INSTANCE) ||
isAdmin(principals)) {
compiledPermissions = AllPermissions.getInstance();
@@ -74,7 +73,7 @@ public class PermissionProviderImpl impl
@Override
public void refresh() {
- immutableRoot = getImmutableRoot(root, acConfig);
+ immutableRoot = getImmutableRoot(root);
compiledPermissions.refresh(immutableRoot, workspaceName);
}
@@ -141,7 +140,7 @@ public class PermissionProviderImpl impl
}
}
- private static ImmutableRoot getImmutableRoot(@Nonnull Root base, @Nonnull
SecurityConfiguration acConfig) {
+ private static ImmutableRoot getImmutableRoot(@Nonnull Root base) {
if (base instanceof ImmutableRoot) {
return (ImmutableRoot) base;
} else {
