Apache
/
archiva-redback-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove duplicate code 

git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1437806 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2013-01-23 23:51:59 +00:00
parent e8c9121897
commit 0392abb261
1 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java
View File

@ -364,32 +364,15 @@ public class LdapRbacManager
{
for ( String roleName : roleNames )
{
Role role = this.rbacImpl.getRole( roleName );
role = ( role == null ) ? new RoleImpl( roleName ) : role;
if ( role != null )
{
rolesCache.put( role.getName(), role );
roles.add( role );
}
Role role = buildRole( roleName );
roles.add( role );
}
}
else if ( this.ldapRoleMapper.isUseDefaultRoleName() )
{
Role role = null;
try
{
role = this.rbacImpl.getRole( group );
}
catch ( RbacObjectNotFoundException e )
{
// if it's mapped role to a group it doesn't exist in jdo
}
role = ( role == null ) ? new RoleImpl( group ) : role;
if ( role != null )
{
rolesCache.put( role.getName(), role );
roles.add( role );
}
Role role = buildRole( group );
roles.add( role );
}
}
@ -397,6 +380,27 @@ public class LdapRbacManager
}
private Role buildRole( String group )
throws RbacManagerException
{
Role role = null;
try
{
role = this.rbacImpl.getRole( group );
}
catch ( RbacObjectNotFoundException e )
{
// if it's mapped role to a group it doesn't exist in jdo
}
role = ( role == null ) ? new RoleImpl( group ) : role;
if ( role != null )
{
rolesCache.put( role.getName(), role );
}
return role;
}
protected List<String> getRealRoles()
throws RbacManagerException
{