MNT-24503 - FixedAclUpdater Job - Skip count if maxSize is set (#2809) (

#2810) (cherry picked from commit a3f6e13)
Alfresco · Jul 24, 2024 · bf5518f · bf5518f
1 parent 481c1e2
commit bf5518f
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/repository/src/main/java/org/alfresco/repo/domain/permissions/FixedAclUpdater.java b/repository/src/main/java/org/alfresco/repo/domain/permissions/FixedAclUpdater.java
@@ -229,6 +229,11 @@ public List<NodeRef> execute() throws Throwable
 
         int countNodesWithAspects()
         {
+            if (maxItems < DEFAULT_MAX_ITEMS) {
+                log.info("Job limited to process a maximum of " + maxItems + " Pending Acls");
+                return maxItems;
+            }
+
             final CountNodesWithAspectCallback countNodesCallback = new CountNodesWithAspectCallback();
             int count = transactionService.getRetryingTransactionHelper()
                     .doInTransaction(new RetryingTransactionCallback<Integer>()
@@ -240,12 +245,6 @@ public Integer execute() throws Throwable
                             return countNodesCallback.getCount();
                         }
                     }, false, true);
-
-            if (count > maxItems)
-            {
-                log.info("Total nodes with pending acl: " + count + " Limiting work to " + maxItems);
-                return maxItems;
-            }
             return count;
         }
     }