You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by pr...@apache.org on 2022/04/06 06:17:44 UTC
[ranger] branch master updated: RANGER-3690: Fix NullPointerException in java patch 054
This is an automated email from the ASF dual-hosted git repository.
pradeep pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ranger.git
The following commit(s) were added to refs/heads/master by this push:
new 8662fb128 RANGER-3690: Fix NullPointerException in java patch 054
8662fb128 is described below
commit 8662fb128ca43a2c5b4e0c507a216e2e769de108
Author: abhishek.kumar <ab...@cloudera.com>
AuthorDate: Thu Mar 31 13:39:54 2022 -0700
RANGER-3690: Fix NullPointerException in java patch 054
Signed-off-by: pradeep <pr...@apache.org>
---
.../org/apache/ranger/patch/PatchForSyncSourceUpdate_J10054.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/security-admin/src/main/java/org/apache/ranger/patch/PatchForSyncSourceUpdate_J10054.java b/security-admin/src/main/java/org/apache/ranger/patch/PatchForSyncSourceUpdate_J10054.java
index e6946b150..bbde1a4df 100644
--- a/security-admin/src/main/java/org/apache/ranger/patch/PatchForSyncSourceUpdate_J10054.java
+++ b/security-admin/src/main/java/org/apache/ranger/patch/PatchForSyncSourceUpdate_J10054.java
@@ -18,6 +18,7 @@
package org.apache.ranger.patch;
import com.google.gson.Gson;
+import org.apache.commons.lang.StringUtils;
import org.apache.ranger.db.RangerDaoManager;
import org.apache.ranger.entity.XXGroup;
import org.apache.ranger.entity.XXPortalUser;
@@ -83,10 +84,10 @@ public class PatchForSyncSourceUpdate_J10054 extends BaseLoader{
for( XXUser xUser: users) {
String syncSource = xUser.getSyncSource();
String otherAttributes = xUser.getOtherAttributes();
- if (otherAttributes != null && syncSource == null){
+ if (StringUtils.isNotEmpty(otherAttributes) && StringUtils.isEmpty(syncSource)){
syncSource = (String) gson.fromJson(otherAttributes, Map.class).get(UgsyncCommonConstants.SYNC_SOURCE);
xUser.setSyncSource(syncSource);
- if (syncSource != null) {
+ if (StringUtils.isNotEmpty(syncSource)) {
XXPortalUser xXPortalUser = daoManager.getXXPortalUser().findByLoginId(xUser.getName());
if (xXPortalUser != null && xXPortalUser.getUserSource() == 0){
/* updating the user source to external for users which had some sync source prior to upgrade
@@ -117,9 +118,9 @@ public class PatchForSyncSourceUpdate_J10054 extends BaseLoader{
for( XXGroup xGroup: groups) {
String syncSource = xGroup.getSyncSource();
String otherAttributes = xGroup.getOtherAttributes();
- if (otherAttributes != null && syncSource == null){
+ if (StringUtils.isNotEmpty(otherAttributes) && StringUtils.isEmpty(syncSource)){
syncSource = (String) gson.fromJson(otherAttributes, Map.class).get(UgsyncCommonConstants.SYNC_SOURCE);
- if (syncSource != null && xGroup.getGroupSource() == 0){
+ if (StringUtils.isNotEmpty(syncSource) && xGroup.getGroupSource() == 0){
xGroup.setGroupSource(1);
if (logger.isDebugEnabled()) {
logger.debug("GROUP: Name: " + xGroup.getName() + " groupSource changed to External");