RANGER-4439: fixed duplicate resource IDs in security zone service re…

…sources Signed-off-by: Madhan Neethiraj <[email protected]>
apache · Sep 28, 2023 · 00fd78a · 00fd78a
1 parent 83978aa
commit 00fd78a
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerSecurityZoneHelper.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerSecurityZoneHelper.java
@@ -209,6 +209,13 @@ public RangerSecurityZoneServiceHelper(RangerSecurityZoneService zoneService, St
                 zoneService.setResourcesBaseInfo(this.resourcesBaseInfo);
             }
 
+            // compute nextResourceId
+            for (RangerSecurityZoneResourceBase baseInfo : resourcesBaseInfo) {
+                if (baseInfo.getId() != null && nextResourceId <= baseInfo.getId()) {
+                    nextResourceId = baseInfo.getId() + 1;
+                }
+            }
+
             // make sure resourcesBaseInfo has as many entries as resources
             for (int i = resourcesBaseInfo.size(); i < resources.size(); i++) {
                 RangerSecurityZoneResourceBase baseInfo = new RangerSecurityZoneResourceBase();
@@ -223,13 +230,6 @@ public RangerSecurityZoneServiceHelper(RangerSecurityZoneService zoneService, St
                 resourcesBaseInfo.remove(i);
             }
 
-            // compute nextResourceId
-            for (RangerSecurityZoneResourceBase baseInfo : resourcesBaseInfo) {
-                if (baseInfo.getId() != null && nextResourceId <= baseInfo.getId()) {
-                    nextResourceId = baseInfo.getId() + 1;
-                }
-            }
-
             // set missing IDs
             for (RangerSecurityZoneResourceBase baseInfo : resourcesBaseInfo) {
                 if (baseInfo.getId() == null) {