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

replace groups class with groupnames

Browse Source
This commit is contained in:
Sebastian Sdorra
2012-08-30 10:38:56 +02:00
parent c7f11a8203
commit 81060af003
4 changed files with 52 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,7 +46,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sonia.scm.config.ScmConfiguration;
import sonia.scm.security.Groups;
import sonia.scm.security.ScmAuthenticationToken;
import sonia.scm.user.User;
import sonia.scm.user.UserManager;
@@ -59,6 +58,7 @@ import java.util.Collections;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import sonia.scm.group.GroupNames;
/**
*
@@ -167,13 +167,13 @@ public class BasicSecurityContext implements WebSecurityContext
public Collection<String> getGroups()
{
Subject subject = SecurityUtils.getSubject();
Groups groups = getPrincipal(Groups.class);
GroupNames groups = getPrincipal(GroupNames.class);
Collection<String> groupCollection = null;
if (groups != null)
{
groupCollection = groups.getGroups();
groupCollection = groups.getCollection();
}
else
{