svn commit: r1882172 - /jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/TopLevelPaths.java

[angela]

Author: angela
Date: Thu Oct  1 06:54:17 2020
New Revision: 1882172

URL: http://svn.apache.org/viewvc?rev=1882172&view=rev
Log:
OAK-9248 : TopLevelPaths.contains: missing 'else'

Modified:
    
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/TopLevelPaths.java

Modified: 
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/TopLevelPaths.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/TopLevelPaths.java?rev=1882172&r1=1882171&r2=1882172&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/TopLevelPaths.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/TopLevelPaths.java
 Thu Oct  1 06:54:17 2020
@@ -61,24 +61,12 @@ class TopLevelPaths implements CugConsta
         }
 
         if (cnt == null) {
-            Tree rootTree = root.getTree(PathUtils.ROOT_PATH);
-            PropertyState hiddenTopCnt = 
rootTree.getProperty(HIDDEN_TOP_CUG_CNT);
-            if (hiddenTopCnt != null) {
-                cnt = hiddenTopCnt.getValue(Type.LONG);
-                if (cnt <= MAX_CNT) {
-                    PropertyState hidden = 
root.getTree(PathUtils.ROOT_PATH).getProperty(HIDDEN_NESTED_CUGS);
-                    paths = (hidden == null) ? new String[0] : 
Iterables.toArray(hidden.getValue(Type.STRINGS), String.class);
-                } else {
-                    paths = new String[0];
-                }
-            } else {
-                cnt = NONE;
-            }
+            computeCntAndPaths();
         }
 
         if (cnt == NONE) {
             return false;
-        } if (cnt > MAX_CNT) {
+        } else if (cnt > MAX_CNT) {
             return true;
         } else {
             for (String p : paths) {
@@ -89,4 +77,20 @@ class TopLevelPaths implements CugConsta
         }
         return false;
     }
+
+    private void computeCntAndPaths() {
+        Tree rootTree = root.getTree(PathUtils.ROOT_PATH);
+        PropertyState hiddenTopCnt = rootTree.getProperty(HIDDEN_TOP_CUG_CNT);
+        if (hiddenTopCnt != null) {
+            cnt = hiddenTopCnt.getValue(Type.LONG);
+            if (cnt <= MAX_CNT) {
+                PropertyState hidden = 
root.getTree(PathUtils.ROOT_PATH).getProperty(HIDDEN_NESTED_CUGS);
+                paths = (hidden == null) ? new String[0] : 
Iterables.toArray(hidden.getValue(Type.STRINGS), String.class);
+            } else {
+                paths = new String[0];
+            }
+        } else {
+            cnt = NONE;
+        }
+    }
 }