From: Olivier Lamy <olamy@apache.org>
Date: Mon, 29 Apr 2013 10:45:48 +0000 (+0000)
Subject: correctly set ssl attribute for ldap connection
X-Git-Tag: archiva-1.4-M4~48
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6fda29b0982c973a901633149e72a142c9d37ab6;p=archiva.git

correctly set ssl attribute for ldap connection

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1476956 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java
index fb7751451..2ed44243d 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java
@@ -293,6 +293,7 @@ public class DefaultRedbackRuntimeConfigurationService
                                                  ldapConfiguration.getBindDn(), ldapConfiguration.getPassword(),
                                                  ldapConfiguration.getAuthenticationMethod(),
                                                  toProperties( ldapConfiguration.getExtraProperties() ) );
+            ldapConnectionConfiguration.setSsl( ldapConfiguration.isSsl() );
 
             ldapConnection = ldapConnectionFactory.getConnection( ldapConnectionConfiguration );
 
@@ -308,6 +309,8 @@ public class DefaultRedbackRuntimeConfigurationService
                                                  ldapConfiguration.getAuthenticationMethod(),
                                                  toProperties( ldapConfiguration.getExtraProperties() ) );
 
+            ldapConnectionConfiguration.setSsl( ldapConfiguration.isSsl() );
+
             ldapConnection = ldapConnectionFactory.getConnection( ldapConnectionConfiguration );
         }
         catch ( InvalidNameException e )