### Eclipse Workspace Patch 1.0 #P oak-core Index: src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeManagerImpl.java =================================================================== --- src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeManagerImpl.java (revision 1527504) +++ src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeManagerImpl.java (working copy) @@ -116,7 +116,11 @@ if (jcrName == null) { throw new AccessControlException("Invalid privilege name 'null'"); } - return namePathMapper.getOakName(jcrName); + String oakName = namePathMapper.getOakNameOrNull(jcrName); + if (oakName == null) { + throw new AccessControlException("Cannot resolve privilege name " + jcrName); + } + return oakName; } @Nonnull