Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-12 08:25:44 +01:00
Code Issues Packages Projects Releases Activity

fix NullPointerException

Browse Source
This commit is contained in:
Sebastian Sdorra
2011-02-18 11:46:09 +01:00
parent 6e200b4e92
commit e8578e6352
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
scm-webapp/src/main/java/sonia/scm/web/security/BasicSecurityContext.java
View File

@@ -298,11 +298,22 @@ public class BasicSecurityContext implements WebSecurityContext
*/ */
private boolean isAdmin() private boolean isAdmin()
{ {
boolean result = configuration.getAdminUsers().contains(user.getName()); boolean result = false;
Set<String> adminUsers = configuration.getAdminUsers();
if (adminUsers != null)
{
result = adminUsers.contains(user.getName());
}
if (!result) if (!result)
{ {
result = Util.containsOne(configuration.getAdminGroups(), groups); Set<String> adminGroups = configuration.getAdminGroups();
if (adminGroups != null)
{
result = Util.containsOne(adminGroups, groups);
}
} }
return result; return result;