Changeset 323:5f6c6c0fb14e

Timestamp:

09/11/11 17:21:42 (5 months ago)

Author:

delmitz

Branch:

default

Convert:

svn:7c3792e6-d75b-4784-96a6-b298f655ee64/trunk@2757

Message:

• fixed NPE.
• added getAdminByLoginName.

Location:

kraken-dom/src/main/java/org/krakenapps/dom

Files:

• api/AdminApi.java (modified) (1 diff)
• api/impl/AdminApiImpl.java (modified) (7 diffs)
• exception/MaxSessionException.java (modified) (2 diffs)
• msgbus/LoginPlugin.java (modified) (1 diff)

kraken-dom/src/main/java/org/krakenapps/dom/api/AdminApi.java

@@ -35 +35 @@
         Admin getAdmin(int organizationId, int adminId);
 
+        Admin getAdminByLoginName(String loginName);
+
         Admin getAdminByUser(int organizationId, int userId);
 

kraken-dom/src/main/java/org/krakenapps/dom/api/impl/AdminApiImpl.java

@@ -98 +98 @@
                                                         }
                                                 } else if (loggedIn.size() >= maxSessions) {
-                                                        Session peek = loggedIn.peek().session;
-                                                        throw new MaxSessionException(peek.getAdminId(), peek);
+                                                        LoggedInAdmin peek = loggedIn.peek();
+                                                        throw new MaxSessionException(peek.loginName, peek.session);
                                                 }
                                         }
@@ -109 +109 @@
                         for (LoginCallback callback : callbacks)
                                 callback.onLoginSuccess(admin, session);
-                        loggedIn.add(new LoggedInAdmin(admin.getRole().getLevel(), new Date(), session));
+                        loggedIn.add(new LoggedInAdmin(admin.getRole().getLevel(), new Date(), session, admin.getUser()
+                                        .getLoginName()));
                         return admin;
                 } else {
@@ -123 +124 @@
                 private Date loginTime;
                 private Session session;
+                private String loginName;
 
                 private LoggedInAdmin(Session session) {
@@ -128 +130 @@
                 }
 
-                private LoggedInAdmin(int level, Date loginTime, Session session) {
+                private LoggedInAdmin(int level, Date loginTime, Session session, String loginName) {
                         this.level = level;
                         this.loginTime = loginTime;
                         this.session = session;
+                        this.loginName = loginName;
                 }
 
@@ -218 +221 @@
         private Admin getAdmin(String nick, Session session) {
                 try {
-                        EntityManager em = entityManagerService.getEntityManager();
-                        Admin admin = (Admin) em.createQuery("SELECT a FROM Admin a LEFT JOIN a.user u WHERE u.loginName = ?")
-                                        .setParameter(1, nick).getSingleResult();
+                        Admin admin = getAdminByLoginName(nick);
                         if (!admin.isEnabled()) {
                                 Date failed = admin.getLastLoginFailedDateTime();
@@ -232 +233 @@
                                         updateLoginFailures(admin, true);
                         }
-
                         admin.setLastLoginDateTime(new Date());
+
+                        EntityManager em = entityManagerService.getEntityManager();
                         em.merge(admin);
                         return admin;
@@ -277 +279 @@
                         return null;
 
+                return admin;
+        }
+
+        @Transactional
+        @Override
+        public Admin getAdminByLoginName(String loginName) {
+                EntityManager em = entityManagerService.getEntityManager();
+                Admin admin = (Admin) em.createQuery("SELECT a FROM Admin a LEFT JOIN a.user u WHERE u.loginName = ?")
+                                .setParameter(1, loginName).getSingleResult();
                 return admin;
         }

kraken-dom/src/main/java/org/krakenapps/dom/exception/MaxSessionException.java

@@ -6 +6 @@
         private static final long serialVersionUID = 1L;
 
-        private Integer adminId;
+        private String loginName;
         private Session session;
 
@@ -13 +13 @@
         }
 
-        public MaxSessionException(Integer adminId, Session session) {
+        public MaxSessionException(String loginName, Session session) {
                 super("max-session");
-                this.adminId = adminId;
+                this.loginName = loginName;
                 this.session = session;
         }
 
-        public Integer getAdminId() {
-                return adminId;
+        public String getLoginName() {
+                return loginName;
         }
 

kraken-dom/src/main/java/org/krakenapps/dom/msgbus/LoginPlugin.java

@@ -82 +82 @@
                         resp.put("result", e.getErrorCode());
                         String loginName = null;
-                        if (e.getAdminId() != null) {
-                                Admin admin = adminApi.getAdmin(req.getOrgId(), e.getAdminId());
+                        if (e.getLoginName() != null) {
+                                Admin admin = adminApi.getAdminByLoginName(e.getLoginName());
                                 loginName = admin.getUser().getLoginName();
                         }