RANGER-4632: Security Zone policies version increases by +2 when we u…

…pdate its policy Signed-off-by: Dineshkumar Yadav <[email protected]>
apache · Feb 2, 2024 · e18f179 · e18f179
1 parent c8fbd01
commit e18f179
Showing 1 changed file with 2 additions and 3 deletions.
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
@@ -101,6 +101,8 @@ protected T mapViewToEntityBean(V vObj, T xObj, int OPERATION_CONTEXT) {
 			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 @@ protected T mapViewToEntityBean(V vObj, T xObj, int OPERATION_CONTEXT) {
 		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();