Author: angela
Date: Wed Mar 25 13:22:26 2015
New Revision: 1669117
URL: http://svn.apache.org/r1669117
Log:
OAK-2674 : Fix FindBug Issues
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/MembershipProvider.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserValidator.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/MembershipProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/MembershipProvider.java?rev=1669117&r1=1669116&r2=1669117&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/MembershipProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/MembershipProvider.java
Wed Mar 25 13:22:26 2015
@@ -261,7 +261,7 @@ class MembershipProvider extends Authori
// filter by authorizable type, and/or get inherited
members
if (next != null && (includeInherited ||
authorizableType != AuthorizableType.AUTHORIZABLE)) {
Tree auth = getByPath(next);
- AuthorizableType type = UserUtil.getType(auth);
+ AuthorizableType type = (auth == null) ? null :
UserUtil.getType(auth);
if (includeInherited && type ==
AuthorizableType.GROUP) {
parent = getMembers(auth, authorizableType,
true, processedRefs);
@@ -360,7 +360,7 @@ class MembershipProvider extends Authori
/**
* Iterator that provides member references based on the rep:members
properties of a underlying tree iterator.
*/
- private class MemberReferenceIterator extends AbstractLazyIterator<String>
{
+ private static class MemberReferenceIterator extends
AbstractLazyIterator<String> {
private final Set<String> processedRefs;
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserValidator.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserValidator.java?rev=1669117&r1=1669116&r2=1669117&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserValidator.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserValidator.java
Wed Mar 25 13:22:26 2015
@@ -187,7 +187,7 @@ class UserValidator extends DefaultValid
}
}
- private void validateAuthorizable(@Nonnull Tree tree, @Nonnull
AuthorizableType type) throws CommitFailedException {
+ private void validateAuthorizable(@Nonnull Tree tree, @Nullable
AuthorizableType type) throws CommitFailedException {
boolean isSystemUser = (type == AuthorizableType.USER) &&
UserUtil.isSystemUser(tree);
String authRoot =
UserUtil.getAuthorizableRootPath(provider.getConfig(), type);
if (isSystemUser) {
