Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java =================================================================== diff -u -r3d4c6e49eac22677462612f300de55a9504021c3 -rf8e0b6190e9d346ff3ef2575254c16140cf91007 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java (.../UserManagementService.java) (revision 3d4c6e49eac22677462612f300de55a9504021c3) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java (.../UserManagementService.java) (revision f8e0b6190e9d346ff3ef2575254c16140cf91007) @@ -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