[ranger] branch ranger-2.2 updated: RANGER-3187:Roles download failed in Ranger after upgrade

[rmani]

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

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


The following commit(s) were added to refs/heads/ranger-2.2 by this push:
     new f371e18  RANGER-3187:Roles download failed in Ranger after upgrade
f371e18 is described below

commit f371e186087e049f039d7549aed4ee0ba69fb146
Author: Ramesh Mani <rm...@cloudera.com>
AuthorDate: Tue Feb 23 12:43:06 2021 -0800

    RANGER-3187:Roles download failed in Ranger after upgrade
---
 .../org/apache/ranger/patch/PatchForXGlobalState_J10036.java  | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git 
a/security-admin/src/main/java/org/apache/ranger/patch/PatchForXGlobalState_J10036.java
 
b/security-admin/src/main/java/org/apache/ranger/patch/PatchForXGlobalState_J10036.java
index 230c6a5..10cd283 100644
--- 
a/security-admin/src/main/java/org/apache/ranger/patch/PatchForXGlobalState_J10036.java
+++ 
b/security-admin/src/main/java/org/apache/ranger/patch/PatchForXGlobalState_J10036.java
@@ -19,6 +19,7 @@ package org.apache.ranger.patch;
 
 import com.google.gson.Gson;
 import org.apache.commons.collections.MapUtils;
+import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.ranger.db.RangerDaoManager;
 import org.apache.ranger.entity.XXGlobalState;
@@ -74,10 +75,12 @@ public class PatchForXGlobalState_J10036 extends BaseLoader 
{
                        if (MapUtils.isNotEmpty(appDataVersionJson)) {
                                logger.info("Updating globalstate appdata 
version for = " + appDataVersionJson);
                                String roleVersion = 
appDataVersionJson.get("RangerRoleVersion");
-                               appDataVersionJson.put("Version", roleVersion);
-                               appDataVersionJson.remove("RangerRoleVersion");
-                               globalState.setAppData(new 
Gson().toJson(appDataVersionJson));
-                               
daoManager.getXXGlobalState().update(globalState);
+                               if (StringUtils.isNotEmpty(roleVersion)) {
+                                       appDataVersionJson.put("Version", 
roleVersion);
+                                       
appDataVersionJson.remove("RangerRoleVersion");
+                                       globalState.setAppData(new 
Gson().toJson(appDataVersionJson));
+                                       
daoManager.getXXGlobalState().update(globalState);
+                               }
                        }
                }
        }