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.70 -r1.71 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java 30 Nov 2006 05:20:25 -0000 1.70 +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java 1 Dec 2006 06:36:46 -0000 1.71 @@ -807,16 +807,18 @@ private Integer getRequestorId() { UserDTO userDTO = (UserDTO)SessionManager.getSession().getAttribute(AttributeNames.USER); - return userDTO.getUserID(); + return (userDTO!=null ? userDTO.getUserID() : null); } public boolean isUserGlobalGroupAdmin() { Integer rootOrgId = getRootOrganisation().getOrganisationId(); - return isUserInRole(getRequestorId(), rootOrgId, Role.GROUP_ADMIN); + Integer requestorId = getRequestorId(); + return (requestorId!=null ? isUserInRole(requestorId, rootOrgId, Role.GROUP_ADMIN) : false); } public boolean isUserSysAdmin() { Integer rootOrgId = getRootOrganisation().getOrganisationId(); - return isUserInRole(getRequestorId(), rootOrgId, Role.SYSADMIN); + Integer requestorId = getRequestorId(); + return (requestorId!=null ? isUserInRole(requestorId, rootOrgId, Role.SYSADMIN) : false); } } \ No newline at end of file