You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by zh...@apache.org on 2017/03/09 01:10:05 UTC
ranger git commit: RANGER-1432:Do some code improvement in
UserMgr.java
Repository: ranger
Updated Branches:
refs/heads/master b2a2516d2 -> 0492cd578
RANGER-1432:Do some code improvement in UserMgr.java
Signed-off-by: zhangqiang2 <zh...@zte.com.cn>
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/0492cd57
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/0492cd57
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/0492cd57
Branch: refs/heads/master
Commit: 0492cd578a4c0d9e1b62a94ea6938422c0557120
Parents: b2a2516
Author: zhangqiang2 <zh...@zte.com.cn>
Authored: Wed Mar 8 11:37:07 2017 +0800
Committer: zhangqiang2 <zh...@zte.com.cn>
Committed: Wed Mar 8 20:09:37 2017 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/ranger/biz/UserMgr.java | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ranger/blob/0492cd57/security-admin/src/main/java/org/apache/ranger/biz/UserMgr.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/UserMgr.java b/security-admin/src/main/java/org/apache/ranger/biz/UserMgr.java
index be16f75..2740fac 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/UserMgr.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/UserMgr.java
@@ -365,7 +365,7 @@ public class UserMgr {
/**
* @param userId
- * @param vStrings
+ * @param vStringRolesList
*/
public void setUserRoles(Long userId, List<VXString> vStringRolesList) {
List<String> stringRolesList = new ArrayList<String>();
@@ -486,7 +486,7 @@ public class UserMgr {
}
/**
- * @param userId
+ * @param gjUser
*/
public VXPortalUser deactivateUser(XXPortalUser gjUser) {
checkAdminAccess();
@@ -617,9 +617,7 @@ public class UserMgr {
userProfile.setEmailAddress(user.getEmailAddress());
}
- if (sess != null) {
- userProfile.setUserSource(sess.getAuthProvider());
- }
+ userProfile.setUserSource(sess.getAuthProvider());
List<XXPortalUserRole> gjUserRoleList = daoManager
.getXXPortalUserRole().findByParentId(user.getId());
@@ -627,10 +625,7 @@ public class UserMgr {
for (XXPortalUserRole gjUserRole : gjUserRoleList) {
userProfile.getUserRoleList().add(gjUserRole.getUserRole());
}
- }
- if (sess.isUserAdmin() || sess.isKeyAdmin()
- || sess.getXXPortalUser().getId().equals(user.getId())) {
userProfile.setId(user.getId());
List<XXUserPermission> xUserPermissions = daoManager
.getXXUserPermission().findByUserPermissionIdAndIsAllowed(