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:03:10 UTC
ranger git commit: RANGER-1431:Do some code improvement in Java
method AuthSessionService.mapEntityToViewBean
Repository: ranger
Updated Branches:
refs/heads/master 7d929b475 -> b2a2516d2
RANGER-1431:Do some code improvement in Java method AuthSessionService.mapEntityToViewBean
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/b2a2516d
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/b2a2516d
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/b2a2516d
Branch: refs/heads/master
Commit: b2a2516d21095046ad9d1c1748e8ee38985f0e17
Parents: 7d929b4
Author: zhangqiang2 <zh...@zte.com.cn>
Authored: Wed Mar 8 10:03:14 2017 +0800
Committer: zhangqiang2 <zh...@zte.com.cn>
Committed: Wed Mar 8 20:02:29 2017 -0500
----------------------------------------------------------------------
.../apache/ranger/service/AuthSessionService.java | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ranger/blob/b2a2516d/security-admin/src/main/java/org/apache/ranger/service/AuthSessionService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/AuthSessionService.java b/security-admin/src/main/java/org/apache/ranger/service/AuthSessionService.java
index 1e21870..249a695 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/AuthSessionService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/AuthSessionService.java
@@ -169,14 +169,16 @@ public class AuthSessionService extends
viewObj.setRequestUserAgent(resource.getRequestUserAgent());
if (resource.getUserId() != null) {
- XXPortalUser gjUser = daoMgr.getXXPortalUser().getById(resource.getUserId());
- viewObj.setEmailAddress(gjUser.getEmailAddress());
- viewObj.setFamilyScreenName(gjUser.getEmailAddress());
- viewObj.setFirstName(gjUser.getFirstName());
- viewObj.setLastName(gjUser.getLastName());
- viewObj.setLastName(gjUser.getLastName());
- viewObj.setPublicScreenName(gjUser.getPublicScreenName());
viewObj.setUserId(resource.getUserId());
+
+ XXPortalUser gjUser = daoMgr.getXXPortalUser().getById(resource.getUserId());
+ if (gjUser != null) {
+ viewObj.setEmailAddress(gjUser.getEmailAddress());
+ viewObj.setFamilyScreenName(gjUser.getLastName());
+ viewObj.setFirstName(gjUser.getFirstName());
+ viewObj.setLastName(gjUser.getLastName());
+ viewObj.setPublicScreenName(gjUser.getPublicScreenName());
+ }
}
return viewObj;