Author: olamy
Date: Mon Apr 29 10:45:48 2013
New Revision: 1476956
URL: http://svn.apache.org/r1476956
Log:
correctly set ssl attribute for ldap connection
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java?rev=1476956&r1=1476955&r2=1476956&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java
Mon Apr 29 10:45:48 2013
@@ -293,6 +293,7 @@ public class DefaultRedbackRuntimeConfig
ldapConfiguration.getBindDn(), ldapConfiguration.getPassword(),
ldapConfiguration.getAuthenticationMethod(),
toProperties(
ldapConfiguration.getExtraProperties() ) );
+ ldapConnectionConfiguration.setSsl( ldapConfiguration.isSsl() );
ldapConnection = ldapConnectionFactory.getConnection(
ldapConnectionConfiguration );
@@ -308,6 +309,8 @@ public class DefaultRedbackRuntimeConfig
ldapConfiguration.getAuthenticationMethod(),
toProperties(
ldapConfiguration.getExtraProperties() ) );
+ ldapConnectionConfiguration.setSsl( ldapConfiguration.isSsl() );
+
ldapConnection = ldapConnectionFactory.getConnection(
ldapConnectionConfiguration );
}
catch ( InvalidNameException e )