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/11 02:50:36 UTC
ranger git commit: RANGER-1444:Do some code improvement in security
admin module
Repository: ranger
Updated Branches:
refs/heads/master a9fb73f42 -> 7ada8bc2c
RANGER-1444:Do some code improvement in security admin module
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/7ada8bc2
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/7ada8bc2
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/7ada8bc2
Branch: refs/heads/master
Commit: 7ada8bc2cb547b589067aa4ef7e834cb41a42f30
Parents: a9fb73f
Author: zhangqiang2 <zh...@zte.com.cn>
Authored: Fri Mar 10 15:17:22 2017 +0800
Committer: zhangqiang2 <zh...@zte.com.cn>
Committed: Fri Mar 10 21:49:55 2017 -0500
----------------------------------------------------------------------
security-admin/src/main/java/org/apache/ranger/biz/UserMgr.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ranger/blob/7ada8bc2/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 2740fac..6f77832 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
@@ -1029,7 +1029,7 @@ public class UserMgr {
if (sess != null) {
// Admin
- if (sess != null && sess.isUserAdmin() || sess.isKeyAdmin()) {
+ if (sess.isUserAdmin() || sess.isKeyAdmin()) {
return;
}
@@ -1056,7 +1056,7 @@ public class UserMgr {
if (sess != null) {
// Admin
- if (sess != null && sess.isUserAdmin()) {
+ if (sess.isUserAdmin()) {
return;
}
@@ -1158,7 +1158,6 @@ public class UserMgr {
userProfile.setFirstName(user.getFirstName());
userProfile.setLastName(user.getLastName());
userProfile.setPublicScreenName(user.getPublicScreenName());
- userProfile.setEmailAddress(user.getEmailAddress());
List<XXPortalUserRole> gjUserRoleList = daoManager
.getXXPortalUserRole().findByParentId(user.getId());