Author: olamy
Date: Wed Apr 24 13:14:37 2013
New Revision: 1471396
URL: http://svn.apache.org/r1471396
Log:
prevent issues when changing role manager implementation
Modified:
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java
Modified:
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java?rev=1471396&r1=1471395&r2=1471396&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java
(original)
+++
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java
Wed Apr 24 13:14:37 2013
@@ -721,8 +721,18 @@ public abstract class AbstractRBACManage
try
{
Role child = getRole( roleName );
- childRoles.put( child.getName(), child );
- updatedChildRoleList.add( roleName );
+ // archiva can change role manager but LDAP can be non
writable so in such case
+ // some roles doesn't exists !!
+ if ( child != null )
+ {
+ childRoles.put( child.getName(), child );
+ updatedChildRoleList.add( roleName );
+ }
+ else
+ {
+ log.warn(
+ "error searching role with name '{}' probably some
issues when migrating your role manager" );
+ }
}
catch ( RbacObjectNotFoundException e )
{
