svn commit: r1708789 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreEditor.java

[angela]

Author: angela
Date: Thu Oct 15 11:01:27 2015
New Revision: 1708789

URL: http://svn.apache.org/viewvc?rev=1708789&view=rev
Log:
OAK-2674 :  Fix FindBug Issues 

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

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreEditor.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreEditor.java?rev=1708789&r1=1708788&r2=1708789&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreEditor.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreEditor.java
 Thu Oct 15 11:01:27 2015
@@ -68,7 +68,7 @@ final class PermissionStoreEditor implem
         if (name.equals(REP_REPO_POLICY)) {
             accessControlledPath = "";
         } else {
-            accessControlledPath = aclPath.length() == 0 ? "/" : aclPath;
+            accessControlledPath = aclPath.isEmpty() ? "/" : aclPath;
         }
         nodeName = PermissionUtil.getEntryName(accessControlledPath);
 
@@ -151,7 +151,8 @@ final class PermissionStoreEditor implem
     }
 
     void updatePermissionEntries() {
-        for (String principalName: entries.keySet()) {
+        for (Map.Entry<String, List<AcEntry>> entry: entries.entrySet()) {
+            String principalName = entry.getKey();
             NodeBuilder principalRoot = permissionRoot.child(principalName);
             if (!principalRoot.hasProperty(JCR_PRIMARYTYPE)) {
                 principalRoot.setProperty(JCR_PRIMARYTYPE, 
NT_REP_PERMISSION_STORE, Type.NAME);
@@ -195,7 +196,7 @@ final class PermissionStoreEditor implem
                 // new parent
                 parent.setProperty(REP_ACCESS_CONTROLLED_PATH, 
accessControlledPath);
             }
-            updateEntries(parent, entries.get(principalName));
+            updateEntries(parent, entry.getValue());
         }
     }