svn commit: r1858846 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositePermissionProviderOr.java

[angela]

Author: angela
Date: Tue May  7 11:50:08 2019
New Revision: 1858846

URL: http://svn.apache.org/viewvc?rev=1858846&view=rev
Log:
OAK-8269 : Improve readability of CompositePermissionProvider and 
CompositeTreePermission (redundant code in 
CompositePermissionProviderOr.getPrivileges)

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

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositePermissionProviderOr.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositePermissionProviderOr.java?rev=1858846&r1=1858845&r2=1858846&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositePermissionProviderOr.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositePermissionProviderOr.java
 Tue May  7 11:50:08 2019
@@ -73,8 +73,6 @@ final class CompositePermissionProviderO
         Tree immutableTree = PermissionUtil.getReadOnlyTreeOrNull(tree, 
getImmutableRoot());
 
         PrivilegeBits result = PrivilegeBits.getInstance();
-        PrivilegeBits denied = PrivilegeBits.getInstance();
-
         PrivilegeBitsProvider bitsProvider = getBitsProvider();
         for (AggregatedPermissionProvider aggregatedPermissionProvider : 
getPermissionProviders()) {
             PrivilegeBits supported = 
aggregatedPermissionProvider.supportedPrivileges(immutableTree, 
null).modifiable();
@@ -86,10 +84,6 @@ final class CompositePermissionProviderO
                 }
             }
         }
-        // subtract all denied privileges from the result
-        if (!denied.isEmpty()) {
-            result.diff(denied);
-        }
         return getBitsProvider().getPrivilegeNames(result);
     }