(ranger) branch ranger-2.5 updated: RANGER-4822: fixed failure in persisting policy validity schedule

[madhan]

This is an automated email from the ASF dual-hosted git repository.

madhan pushed a commit to branch ranger-2.5
in repository https://gitbox.apache.org/repos/asf/ranger.git


The following commit(s) were added to refs/heads/ranger-2.5 by this push:
     new 07584e288 RANGER-4822: fixed failure in persisting policy validity 
schedule
07584e288 is described below

commit 07584e2884b8f0ed6232e71f8dd40f03cbad4318
Author: Anand Nadar <nadaranand...@gmail.com>
AuthorDate: Tue Jun 25 07:28:30 2024 -0700

    RANGER-4822: fixed failure in persisting policy validity schedule
    
    Signed-off-by: Madhan Neethiraj <mad...@apache.org>
    (cherry picked from commit 2a1bd00fad5777bee92a7ae7e5a5eb07c6d61ecc)
---
 .../java/org/apache/ranger/service/RangerPolicyServiceBase.java   | 8 +++-----
 1 file changed, 3 insertions(+), 5 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
old mode 100644
new mode 100755
index ad7cdc7f6..bbfcba8fd
--- 
a/security-admin/src/main/java/org/apache/ranger/service/RangerPolicyServiceBase.java
+++ 
b/security-admin/src/main/java/org/apache/ranger/service/RangerPolicyServiceBase.java
@@ -17,6 +17,7 @@
 
 package org.apache.ranger.service;
 
+import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.ranger.authorization.utils.JsonUtils;
 import org.apache.ranger.common.*;
@@ -199,13 +200,10 @@ public abstract class RangerPolicyServiceBase<T extends 
XXPolicyBase, V extends
                String              validitySchedules = 
JsonUtils.listToJson(vObj.getValiditySchedules());
                Map<String, Object> options           = vObj.getOptions();
 
-               if (options == null) {
-                       options = new HashMap<>();
-               }
-
                if (StringUtils.isNotBlank(validitySchedules)) {
+                       options = vObj.getUpdatableMap(options);
                        options.put(OPTION_POLICY_VALIDITY_SCHEDULES, 
validitySchedules);
-               } else {
+               } else if (MapUtils.isNotEmpty(options)) {
                        options.remove(OPTION_POLICY_VALIDITY_SCHEDULES);
                }