You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by ga...@apache.org on 2015/12/02 05:07:47 UTC
incubator-ranger git commit: RANGER-748 : Fix - Users in policy got
changed after upgrade
Repository: incubator-ranger
Updated Branches:
refs/heads/master 44d365434 -> 68ab77b29
RANGER-748 : Fix - Users in policy got changed after upgrade
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/68ab77b2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/68ab77b2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/68ab77b2
Branch: refs/heads/master
Commit: 68ab77b298f817b3e3bd6544921d27bcae5e98b4
Parents: 44d3654
Author: Gautam Borad <ga...@apache.org>
Authored: Tue Nov 24 18:09:34 2015 +0530
Committer: Gautam Borad <ga...@apache.org>
Committed: Wed Dec 2 09:37:33 2015 +0530
----------------------------------------------------------------------
.../main/java/org/apache/ranger/biz/RangerPolicyRetriever.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/68ab77b2/security-admin/src/main/java/org/apache/ranger/biz/RangerPolicyRetriever.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/RangerPolicyRetriever.java b/security-admin/src/main/java/org/apache/ranger/biz/RangerPolicyRetriever.java
index 4c65178..e3adc1d 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/RangerPolicyRetriever.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/RangerPolicyRetriever.java
@@ -44,6 +44,7 @@ import org.apache.ranger.entity.XXPolicyResourceMap;
import org.apache.ranger.entity.XXPortalUser;
import org.apache.ranger.entity.XXResourceDef;
import org.apache.ranger.entity.XXService;
+import org.apache.ranger.entity.XXUser;
import org.apache.ranger.plugin.model.RangerPolicy;
import org.apache.ranger.plugin.model.RangerPolicy.RangerPolicyItem;
import org.apache.ranger.plugin.model.RangerPolicy.RangerPolicyItemAccess;
@@ -250,10 +251,10 @@ public class RangerPolicyRetriever {
ret = userNames.get(userId);
if(ret == null) {
- XXPortalUser user = daoMgr.getXXPortalUser().getById(userId);
+ XXUser user = daoMgr.getXXUser().getById(userId);
if(user != null) {
- ret = user.getLoginId();
+ ret = user.getName(); // Name is `loginId`
userNames.put(userId, ret);
}