svn commit: r1858199 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/CompiledPermissionImpl.java

[angela]

Author: angela
Date: Fri Apr 26 12:45:50 2019
New Revision: 1858199

URL: http://svn.apache.org/viewvc?rev=1858199&view=rev
Log:
OAK-8266 : Redundant check for existing tree in 
CompiledPermissionImpl.buildVersionDelegatee

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/CompiledPermissionImpl.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/CompiledPermissionImpl.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/CompiledPermissionImpl.java?rev=1858199&r1=1858198&r2=1858199&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/CompiledPermissionImpl.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/CompiledPermissionImpl.java
 Fri Apr 26 12:45:50 2019
@@ -201,9 +201,6 @@ final class CompiledPermissionImpl imple
                          * (or item in the subtree) but that item no longer 
exists
                          * -> evaluation by path might be more accurate (-> 
see #isGranted)
                          */
-                        while (!versionableTree.exists()) {
-                            versionableTree = versionableTree.getParent();
-                        }
                         return new VersionTreePermission(tree, 
buildVersionDelegatee(versionableTree), providerCtx.getTreeProvider());
                     }
                 }
@@ -222,11 +219,13 @@ final class CompiledPermissionImpl imple
 
     @NotNull
     private TreePermission buildVersionDelegatee(@NotNull Tree 
versionableTree) {
-        if (!versionableTree.exists()) {
-            return TreePermission.EMPTY;
-        } else if (versionableTree.isRoot()) {
+        while (!versionableTree.exists()) {
+            versionableTree = versionableTree.getParent();
+        }
+        if (versionableTree.isRoot()) {
             return createRootPermission(versionableTree);
         }
+
         TreeType type = typeProvider.getType(versionableTree);
         switch (type) {
             case HIDDEN : return ALL;