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/03 10:31:55 UTC

svn commit: r1663576 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeDefinitionReader.java

Author: angela
Date: Tue Mar  3 09:31:54 2015
New Revision: 1663576

URL: http://svn.apache.org/r1663576
Log:
minor improvement: Root.getTree never returns null but tree might not exist

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeDefinitionReader.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeDefinitionReader.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeDefinitionReader.java?rev=1663576&r1=1663575&r2=1663576&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeDefinitionReader.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeDefinitionReader.java Tue Mar  3 09:31:54 2015
@@ -67,7 +67,7 @@ class PrivilegeDefinitionReader implemen
      */
     @CheckForNull
     PrivilegeDefinition readDefinition(String privilegeName) {
-        if (privilegesTree == null || !privilegesTree.hasChild(privilegeName)) {
+        if (!privilegesTree.exists() || !privilegesTree.hasChild(privilegeName)) {
             return null;
         } else {
             Tree definitionTree = privilegesTree.getChild(privilegeName);