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/03/26 10:02:05 UTC
svn commit: r1669298 - in
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization:
accesscontrol/AccessControlImporter.java restriction/GlobPattern.java
Author: angela
Date: Thu Mar 26 09:02:04 2015
New Revision: 1669298
URL: http://svn.apache.org/r1669298
Log:
OAK-2674 : Fix FindBug Issues
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlImporter.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/GlobPattern.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlImporter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlImporter.java?rev=1669298&r1=1669297&r2=1669298&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlImporter.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlImporter.java Thu Mar 26 09:02:04 2015
@@ -197,39 +197,39 @@ public class AccessControlImporter imple
private JackrabbitAccessControlList getACL(Tree tree) throws RepositoryException {
String nodeName = tree.getName();
- JackrabbitAccessControlList acl = null;
+ JackrabbitAccessControlList acList = null;
if (!tree.isRoot()) {
Tree parent = tree.getParent();
if (AccessControlConstants.REP_POLICY.equals(nodeName)
&& ntMgr.isNodeType(tree, AccessControlConstants.NT_REP_ACL)) {
- acl = getACL(parent.getPath());
+ acList = getACL(parent.getPath());
} else if (AccessControlConstants.REP_REPO_POLICY.equals(nodeName)
&& ntMgr.isNodeType(tree, AccessControlConstants.NT_REP_ACL)
&& parent.isRoot()) {
- acl = getACL((String) null);
+ acList = getACL((String) null);
}
}
- if (acl != null) {
+ if (acList != null) {
// clear all existing entries
- for (AccessControlEntry ace: acl.getAccessControlEntries()) {
- acl.removeAccessControlEntry(ace);
+ for (AccessControlEntry ace: acList.getAccessControlEntries()) {
+ acList.removeAccessControlEntry(ace);
}
}
- return acl;
+ return acList;
}
@CheckForNull
private JackrabbitAccessControlList getACL(String path) throws RepositoryException {
- JackrabbitAccessControlList acl = null;
+ JackrabbitAccessControlList acList = null;
for (AccessControlPolicy p : acMgr.getPolicies(path)) {
if (p instanceof JackrabbitAccessControlList) {
- acl = (JackrabbitAccessControlList) p;
+ acList = (JackrabbitAccessControlList) p;
break;
}
}
- return acl;
+ return acList;
}
//--------------------------------------------------------------------------
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/GlobPattern.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/GlobPattern.java?rev=1669298&r1=1669297&r2=1669298&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/GlobPattern.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/GlobPattern.java Thu Mar 26 09:02:04 2015
@@ -119,8 +119,8 @@ final class GlobPattern implements Restr
//-------------------------------------------------< RestrictionPattern >---
@Override
public boolean matches(@Nonnull Tree tree, @Nullable PropertyState property) {
- String path = (property == null) ? tree.getPath() : PathUtils.concat(tree.getPath(), property.getName());
- return matches(path);
+ String itemPath = (property == null) ? tree.getPath() : PathUtils.concat(tree.getPath(), property.getName());
+ return matches(itemPath);
}
@Override