directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kayyag...@apache.org
Subject svn commit: r1632402 - /directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java
Date Thu, 16 Oct 2014 17:58:04 GMT
Author: kayyagari
Date: Thu Oct 16 17:58:04 2014
New Revision: 1632402

URL: http://svn.apache.org/r1632402
Log:
set the useTLS flag in connection's configuration (DIRSERVER-2012)

Modified:
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java?rev=1632402&r1=1632401&r2=1632402&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java
(original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java
Thu Oct 16 17:58:04 2014
@@ -221,6 +221,7 @@ public class ReplicationConsumerImpl imp
                 if ( config.isUseTls() )
                 {
                     connection.getConfig().setTrustManagers( config.getTrustManager() );
+                    connection.getConfig().setUseTls( true );
                 }
                 
                 connection.addConnectionClosedEventListener( this );
@@ -234,11 +235,6 @@ public class ReplicationConsumerImpl imp
                 // Do a bind
                 try
                 {
-                    if ( config.isUseTls() )
-                    {
-                        connection.startTls();
-                    }
-
                     connection.bind( config.getReplUserDn(), Strings.utf8ToString( config.getReplUserPassword()
) );
                     disconnected = false;
 



Mime
View raw message