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 2019/02/28 15:43:05 UTC
svn commit: r1854535 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeAccessControlManager.java

Author: angela
Date: Thu Feb 28 15:43:04 2019
New Revision: 1854535

URL: http://svn.apache.org/viewvc?rev=1854535&view=rev
Log:
OAK-8096 : CompositeAccessControlManager: misleading local field name

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeAccessControlManager.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeAccessControlManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeAccessControlManager.java?rev=1854535&r1=1854534&r2=1854535&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeAccessControlManager.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeAccessControlManager.java Thu Feb 28 15:43:04 2019
@@ -83,11 +83,11 @@ class CompositeAccessControlManager exte
 
     @Override
     public AccessControlPolicy[] getEffectivePolicies(String absPath) throws RepositoryException {
-        ImmutableList.Builder<AccessControlPolicy> privs = ImmutableList.builder();
+        ImmutableList.Builder<AccessControlPolicy> policies = ImmutableList.builder();
         for (AccessControlManager acMgr : acMgrs) {
-            privs.add(acMgr.getEffectivePolicies(absPath));
+            policies.add(acMgr.getEffectivePolicies(absPath));
         }
-        List<AccessControlPolicy> l = privs.build();
+        List<AccessControlPolicy> l = policies.build();
         return l.toArray(new AccessControlPolicy[0]);
     }
 
@@ -139,25 +139,25 @@ class CompositeAccessControlManager exte
 
     @Override
     public JackrabbitAccessControlPolicy[] getPolicies(Principal principal) throws RepositoryException {
-        ImmutableList.Builder<JackrabbitAccessControlPolicy> privs = ImmutableList.builder();
+        ImmutableList.Builder<JackrabbitAccessControlPolicy> policies = ImmutableList.builder();
         for (AccessControlManager acMgr : acMgrs) {
             if (acMgr instanceof JackrabbitAccessControlManager) {
-                privs.add(((JackrabbitAccessControlManager) acMgr).getPolicies(principal));
+                policies.add(((JackrabbitAccessControlManager) acMgr).getPolicies(principal));
             }
         }
-        List<JackrabbitAccessControlPolicy> l = privs.build();
+        List<JackrabbitAccessControlPolicy> l = policies.build();
         return l.toArray(new JackrabbitAccessControlPolicy[0]);
     }
 
     @Override
     public AccessControlPolicy[] getEffectivePolicies(Set<Principal> principals) throws RepositoryException {
-        ImmutableList.Builder<AccessControlPolicy> privs = ImmutableList.builder();
+        ImmutableList.Builder<AccessControlPolicy> policies = ImmutableList.builder();
         for (AccessControlManager acMgr : acMgrs) {
             if (acMgr instanceof JackrabbitAccessControlManager) {
-                privs.add(((JackrabbitAccessControlManager) acMgr).getEffectivePolicies(principals));
+                policies.add(((JackrabbitAccessControlManager) acMgr).getEffectivePolicies(principals));
             }
         }
-        List<AccessControlPolicy> l = privs.build();
+        List<AccessControlPolicy> l = policies.build();
         return l.toArray(new AccessControlPolicy[0]);
     }
 }