Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java,v diff -u -r1.36 -r1.37 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java 28 Jun 2006 04:31:59 -0000 1.36 +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java 28 Jun 2006 23:42:43 -0000 1.37 @@ -356,7 +356,8 @@ } public User getUserByLogin(String login) { - return (User)baseDAO.findByProperty(User.class,"login",login).get(0); + List results = baseDAO.findByProperty(User.class,"login",login); + return results.isEmpty() ? null : (User)results.get(0); } public void updatePassword(String login, String password) {