You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by an...@apache.org on 2011/10/04 11:06:29 UTC
svn commit: r1178733 - in
/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization:
acl/ACLProvider.java combined/CombinedProvider.java
Author: angela
Date: Tue Oct 4 09:06:28 2011
New Revision: 1178733
URL: http://svn.apache.org/viewvc?rev=1178733&view=rev
Log:
minor improvement
Modified:
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/ACLProvider.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/combined/CombinedProvider.java
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/ACLProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/ACLProvider.java?rev=1178733&r1=1178732&r2=1178733&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/ACLProvider.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/ACLProvider.java Tue Oct 4 09:06:28 2011
@@ -108,7 +108,7 @@ public class ACLProvider extends Abstrac
// minimal protection on the root node.
NodeImpl root = (NodeImpl) session.getRootNode();
rootNodeId = root.getNodeId();
- ACLEditor systemEditor = new ACLEditor(systemSession, this);
+ ACLEditor systemEditor = new ACLEditor(session, this);
// TODO: replace by configurable default policy (see JCR-2331)
boolean initializedWithDefaults = !configuration.containsKey(PARAM_OMIT_DEFAULT_PERMISSIONS);
@@ -116,7 +116,7 @@ public class ACLProvider extends Abstrac
initRootACL(session, systemEditor);
}
- entryCollector = createEntryCollector((SessionImpl) systemSession);
+ entryCollector = createEntryCollector(session);
}
@Override
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/combined/CombinedProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/combined/CombinedProvider.java?rev=1178733&r1=1178732&r2=1178733&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/combined/CombinedProvider.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/combined/CombinedProvider.java Tue Oct 4 09:06:28 2011
@@ -110,13 +110,13 @@ public class CombinedProvider extends Ab
providers[0] = new org.apache.jackrabbit.core.security.authorization.acl.ACLProvider();
Map config = new HashMap(configuration);
config.put(PARAM_OMIT_DEFAULT_PERMISSIONS, Boolean.TRUE);
- providers[0].init(systemSession, config);
+ providers[0].init(session, config);
// 2) the principal-base ACL provider which is intended to provide
// the default/standard permissions present at an item for a given
// set of principals.
providers[1] = new ACLProvider();
- providers[1].init(systemSession, configuration);
+ providers[1].init(session, configuration);
}
/**