Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-01-20 22:42:16 +01:00
Code Issues Packages Projects Releases Activity

fix possible nullpointerexception

Browse Source
This commit is contained in:
Sebastian Sdorra
2011-11-27 20:19:31 +01:00
parent 54bc388649
commit 2865ad26aa
1 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
scm-core/src/main/java/sonia/scm/repository/PermissionUtil.java
View File

@@ -118,26 +118,33 @@ public class PermissionUtil
public static boolean hasPermission(Repository repository,
WebSecurityContext securityContext, PermissionType pt)
{
User user = securityContext.getUser();
String username = user.getName();
AssertUtil.assertIsNotEmpty(username);
boolean result = false;
if (user.isAdmin()
|| ((pt == PermissionType.READ) && repository.isPublicReadable()))
if (securityContext != null)
{
result = true;
}
else
{
List<Permission> permissions = repository.getPermissions();
User user = securityContext.getUser();
if (permissions != null)
if (user != null)
{
result = hasPermission(permissions, username,
securityContext.getGroups(), pt);
String username = user.getName();
AssertUtil.assertIsNotEmpty(username);
if (user.isAdmin()
|| ((pt == PermissionType.READ) && repository.isPublicReadable()))
{
result = true;
}
else
{
List<Permission> permissions = repository.getPermissions();
if (permissions != null)
{
result = hasPermission(permissions, username,
securityContext.getGroups(), pt);
}
}
}
}