commit e18f17991b97009161891f008975deba6be9aaca
author RakeshGuptaDev <rakesh.gupta.dev264@gmail.com> Wed Jan 03 18:54:28 2024 +0530
committer Dineshkumar Yadav <dineshkumar.yadav@outlook.com> Fri Feb 02 16:13:42 2024 +0530
tree 948ce40b6dad01fdf40cfe3d08ce739cb58c6a5d
parent c8fbd01b9d28550293ae61f6c2b26816c85a1b5b

RANGER-4632: Security Zone policies version increases by +2 when we update its policy

Signed-off-by: Dineshkumar Yadav <dineshkumar.yadav@outlook.com>

security-admin/src/main/java/org/apache/ranger/service/RangerPolicyServiceBase.java

diff --git a/security-admin/src/main/java/org/apache/ranger/service/RangerPolicyServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/RangerPolicyServiceBase.java
index 9f3b110..a2929f3 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/RangerPolicyServiceBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/RangerPolicyServiceBase.java
@@ -101,6 +101,8 @@
 			throw restErrorUtil.createRESTException("No corresponding service found for policyName: " + vObj.getName()
 					+ "Service Not Found : " + vObj.getService(), MessageEnums.INVALID_INPUT_DATA);
 		}
+		Long zoneId = convertZoneNameToZoneId(vObj.getZoneName(), vObj);
+		xObj.setZoneId(zoneId);
 
 		XXServiceDef xServiceDef = daoMgr.getXXServiceDef().getById(xService.getType());
 		if (xServiceDef != null) {
@@ -133,9 +135,6 @@
 		xObj.setResourceSignature(vObj.getResourceSignature());
 		xObj.setIsAuditEnabled(vObj.getIsAuditEnabled());
 		xObj.setIsEnabled(vObj.getIsEnabled());
-		Long zoneId = convertZoneNameToZoneId(vObj.getZoneName(), vObj);
-
-		xObj.setZoneId(zoneId);
 
 		String              validitySchedules = JsonUtils.listToJson(vObj.getValiditySchedules());
 		Map<String, Object> options           = vObj.getOptions();