From: Christos V. Stathis <chstath@ebs.gr>
Date: Thu, 14 Apr 2011 13:12:06 +0000 (+0300)
Subject: Search for users with no logins does not throw ObjectNotFoundException
X-Git-Tag: pithos/v0.7.8~323^2~14^2~10
X-Git-Url: https://code.grnet.gr/git/pithos/commitdiff_plain/8dcdfa8d7a8f99113eb61693b3ba35eae326bca6

Search for users with no logins does not throw ObjectNotFoundException
---

diff --git a/src/gr/ebs/gss/server/ejb/AdminAPIBean.java b/src/gr/ebs/gss/server/ejb/AdminAPIBean.java
index 1f80613..9a18069 100644
--- a/src/gr/ebs/gss/server/ejb/AdminAPIBean.java
+++ b/src/gr/ebs/gss/server/ejb/AdminAPIBean.java
@@ -228,9 +228,13 @@ public class AdminAPIBean implements AdminAPI {
 		List<UserDTO> result = new ArrayList<UserDTO>();
 		for (User u : users){
 			UserDTO tempDTO = u.getDTO();
-			List<UserLogin> userLogins = api.getLastUserLogins(u.getId());
-			tempDTO.setCurrentLoginDate(userLogins.get(0).getLoginDate());
-			tempDTO.setLastLoginDate(userLogins.get(1).getLoginDate());	
+            try {
+			    List<UserLogin> userLogins = api.getLastUserLogins(u.getId());
+			    tempDTO.setCurrentLoginDate(userLogins.get(0).getLoginDate());
+			    tempDTO.setLastLoginDate(userLogins.get(1).getLoginDate());
+            }
+            catch (ObjectNotFoundException e) {//Do nothing
+            }
 			result.add(tempDTO);
 		}
 		return result;
@@ -241,9 +245,13 @@ public class AdminAPIBean implements AdminAPI {
 		User u = dao.getUser(username);
 		if(u!=null){
 			UserDTO tempDTO = u.getDTO();
-			List<UserLogin> userLogins = api.getLastUserLogins(u.getId());
-			tempDTO.setCurrentLoginDate(userLogins.get(0).getLoginDate());
-            tempDTO.setLastLoginDate(userLogins.get(1).getLoginDate());
+            try {
+			    List<UserLogin> userLogins = api.getLastUserLogins(u.getId());
+			    tempDTO.setCurrentLoginDate(userLogins.get(0).getLoginDate());
+                tempDTO.setLastLoginDate(userLogins.get(1).getLoginDate());
+            }
+            catch (ObjectNotFoundException e) {//Do nothing
+            }
 			return tempDTO;
 			
 		}