From 2a48dcf4d5b3f350fc0214e43552c2e2202a56df Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Thu, 30 Aug 2012 16:34:43 +0200
Subject: [PATCH] fix bug with group permissions

---
 .../src/main/java/sonia/scm/security/ScmRealm.java     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/scm-webapp/src/main/java/sonia/scm/security/ScmRealm.java b/scm-webapp/src/main/java/sonia/scm/security/ScmRealm.java
index aaf981bc94..d34a8c2be7 100644
--- a/scm-webapp/src/main/java/sonia/scm/security/ScmRealm.java
+++ b/scm-webapp/src/main/java/sonia/scm/security/ScmRealm.java
@@ -96,10 +96,10 @@ public class ScmRealm extends AuthorizingRealm
 {
 
   /** Field description */
-  private static final String CACHE_NAME = "sonia.cache.authorizing";
+  public static final String NAME = "scm";
 
   /** Field description */
-  private static final String NAME = "scm";
+  private static final String CACHE_NAME = "sonia.cache.authorizing";
 
   /** Field description */
   private static final String SCM_CREDENTIALS = "SCM_CREDENTIALS";
@@ -460,7 +460,7 @@ public class ScmRealm extends AuthorizingRealm
    * @return
    */
   private List<org.apache.shiro.authz.Permission> collectRepositoryPermissions(
-    User user, Collection<String> groups)
+    User user, GroupNames groups)
   {
     List<org.apache.shiro.authz.Permission> permissions = Lists.newArrayList();
 
@@ -489,7 +489,7 @@ public class ScmRealm extends AuthorizingRealm
    */
   private void collectRepositoryPermissions(
     List<org.apache.shiro.authz.Permission> permissions, Repository repository,
-    User user, Collection<String> groups)
+    User user, GroupNames groups)
   {
     List<Permission> repositoryPermissions = repository.getPermissions();
 
@@ -582,7 +582,7 @@ public class ScmRealm extends AuthorizingRealm
     }
     else
     {
-      permissions = collectRepositoryPermissions(user, roles);
+      permissions = collectRepositoryPermissions(user, groups);
     }
 
     SimpleAuthorizationInfo info = new SimpleAuthorizationInfo(roles);