From a3f6e13a7c7c0b07f653ca700c74374bc67af951 Mon Sep 17 00:00:00 2001
From: Eva Vasques <eva.vasques@gmail.com>
Date: Wed, 24 Jul 2024 13:40:50 +0100
Subject: [PATCH] MNT-24503 - FixedAclUpdater Job - Skip count if maxSize is
 set (#2809)

---
 .../repo/domain/permissions/FixedAclUpdater.java      | 11 +++++------
 1 file changed, 5 insertions(+), 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
index 750c85afaf..b9da62f6e3 100644
--- a/repository/src/main/java/org/alfresco/repo/domain/permissions/FixedAclUpdater.java
+++ b/repository/src/main/java/org/alfresco/repo/domain/permissions/FixedAclUpdater.java
@@ -235,6 +235,11 @@ public class FixedAclUpdater extends TransactionListenerAdapter implements Appli
 
         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>()
@@ -246,12 +251,6 @@ public class FixedAclUpdater extends TransactionListenerAdapter implements Appli
                             return countNodesCallback.getCount();
                         }
                     }, false, true);
-
-            if (count > maxItems)
-            {
-                log.info("Total nodes with pending acl: " + count + " Limiting work to " + maxItems);
-                return maxItems;
-            }
             return count;
         }
     }