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 2014/12/23 01:40:05 UTC
svn commit: r1647458 -
/archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/main/java/org/apache/archiva/redback/components/registry/commons/CommonsConfigurationRegistry.java
Author: olamy
Date: Tue Dec 23 00:40:05 2014
New Revision: 1647458
URL: http://svn.apache.org/r1647458
Log:
[MRM-1486] ldap.config.mapper.attribute.user.filter using ldap not working correctly with commas.
Modified:
archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/main/java/org/apache/archiva/redback/components/registry/commons/CommonsConfigurationRegistry.java
Modified: archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/main/java/org/apache/archiva/redback/components/registry/commons/CommonsConfigurationRegistry.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/main/java/org/apache/archiva/redback/components/registry/commons/CommonsConfigurationRegistry.java?rev=1647458&r1=1647457&r2=1647458&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/main/java/org/apache/archiva/redback/components/registry/commons/CommonsConfigurationRegistry.java (original)
+++ archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/src/main/java/org/apache/archiva/redback/components/registry/commons/CommonsConfigurationRegistry.java Tue Dec 23 00:40:05 2014
@@ -157,7 +157,18 @@ public class CommonsConfigurationRegistr
for ( Iterator i = configuration.getKeys(); i.hasNext(); )
{
String property = (String) i.next();
- properties.setProperty( property, configuration.getString( property ) );
+ List l = configuration.getList( property );
+ StringBuilder sb = new StringBuilder();
+ for( Object element : l )
+ {
+ sb.append( ( String ) element );
+ sb.append( "," );
+ }
+ if( sb.length() > 0 )
+ {
+ sb.deleteCharAt( sb.length() - 1 );
+ }
+ properties.setProperty( property, sb.toString() );
}
return properties;
}