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 2015/08/06 11:05:50 UTC
svn commit: r1694426 -
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/Permissions.java
Author: angela
Date: Thu Aug 6 09:05:50 2015
New Revision: 1694426
URL: http://svn.apache.org/r1694426
Log:
OAK-2674 : Fix FindBug Issues
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/Permissions.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/Permissions.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/Permissions.java?rev=1694426&r1=1694425&r2=1694426&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/Permissions.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/Permissions.java Thu Aug 6 09:05:50 2015
@@ -410,9 +410,9 @@ public final class Permissions {
// map remaining actions and permission-names that have a simple 1:1
// mapping between action and permission
if (!actions.isEmpty()) {
- for (String action : ACTIONS_MAP.keySet()) {
- if (actions.remove(action)) {
- permissions |= ACTIONS_MAP.get(action);
+ for (Map.Entry<String, Long> actionEntry : ACTIONS_MAP.entrySet()) {
+ if (actions.remove(actionEntry.getKey())) {
+ permissions |= actionEntry.getValue();
}
}
permissions |= getPermissions(actions);