From e18f17991b97009161891f008975deba6be9aaca Mon Sep 17 00:00:00 2001 From: RakeshGuptaDev Date: Wed, 3 Jan 2024 18:54:28 +0530 Subject: [PATCH] RANGER-4632: Security Zone policies version increases by +2 when we update its policy Signed-off-by: Dineshkumar Yadav --- .../org/apache/ranger/service/RangerPolicyServiceBase.java | 5 ++--- 1 file changed, 2 insertions(+), 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 index 9f3b110425..a2929f3c16 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 @@ 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 options = vObj.getOptions();