You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2013/01/16 00:44:12 UTC

svn commit: r1433742 - /archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaRbacManager.java

Author: olamy
Date: Tue Jan 15 23:44:12 2013
New Revision: 1433742

URL: http://svn.apache.org/viewvc?rev=1433742&view=rev
Log:
try all impls for returning a role

Modified:
    archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaRbacManager.java

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaRbacManager.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaRbacManager.java?rev=1433742&r1=1433741&r2=1433742&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaRbacManager.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaRbacManager.java Tue Jan 15 23:44:12 2013
@@ -110,8 +110,16 @@ public class ArchivaRbacManager
     public Role getRole( String roleName )
         throws RbacObjectNotFoundException, RbacManagerException
     {
-        // iterate until not null ?
-        return getRbacManagerForCommon().getRole( roleName );
+        for ( RBACManager rbacManager : rbacManagersPerId.values() )
+        {
+            Role role = rbacManager.getRole( roleName );
+            if ( role != null )
+            {
+                return role;
+            }
+        }
+        log.debug( "cannot find role for name: ‘{}", roleName );
+        return null;
     }
 
     public List<Role> getAllRoles()