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 2017/03/06 14:02:49 UTC
svn commit: r1785652 - in
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user:
AuthorizableIterator.java UserManagerImpl.java
Author: angela
Date: Mon Mar 6 14:02:49 2017
New Revision: 1785652
URL: http://svn.apache.org/viewvc?rev=1785652&view=rev
Log:
OAK-5895 : Avoid jcr-path conversion in AuthorizableIterator
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableIterator.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserManagerImpl.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableIterator.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableIterator.java?rev=1785652&r1=1785651&r2=1785652&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableIterator.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableIterator.java Mon Mar 6 14:02:49 2017
@@ -95,14 +95,13 @@ final class AuthorizableIterator impleme
@Override
public Authorizable apply(String oakPath) {
- String jcrPath = userManager.getNamePathMapper().getJcrPath(oakPath);
try {
- Authorizable a = userManager.getAuthorizableByPath(jcrPath);
+ Authorizable a = userManager.getAuthorizableByOakPath(oakPath);
if (predicate.apply(a)) {
return a;
}
} catch (RepositoryException e) {
- log.debug("Failed to access authorizable " + jcrPath);
+ log.debug("Failed to access authorizable " + oakPath);
}
return null;
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserManagerImpl.java?rev=1785652&r1=1785651&r2=1785652&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserManagerImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserManagerImpl.java Mon Mar 6 14:02:49 2017
@@ -130,7 +130,7 @@ public class UserManagerImpl implements
if (oakPath == null) {
throw new RepositoryException("Invalid path " + path);
}
- return getAuthorizable(userProvider.getAuthorizableByPath(oakPath));
+ return getAuthorizableByOakPath(oakPath);
}
@Override
@@ -368,6 +368,11 @@ public class UserManagerImpl implements
return getAuthorizable(UserUtil.getAuthorizableId(tree), tree);
}
+ @CheckForNull
+ Authorizable getAuthorizableByOakPath(@Nonnull String oakPath) throws RepositoryException {
+ return getAuthorizable(userProvider.getAuthorizableByPath(oakPath));
+ }
+
@Nonnull
NamePathMapper getNamePathMapper() {
return namePathMapper;