Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5D4CE1745E for ; Thu, 16 Oct 2014 17:58:29 +0000 (UTC) Received: (qmail 10120 invoked by uid 500); 16 Oct 2014 17:58:29 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 10082 invoked by uid 500); 16 Oct 2014 17:58:29 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 10073 invoked by uid 99); 16 Oct 2014 17:58:29 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Oct 2014 17:58:29 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Oct 2014 17:58:06 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 089C023889D5; Thu, 16 Oct 2014 17:58:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@directory.apache.org From: kayyagari@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20141016175805.089C023889D5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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;