You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2013/06/10 15:21:11 UTC
svn commit: r1491443 -
/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java
Author: pamarcelot
Date: Mon Jun 10 13:21:10 2013
New Revision: 1491443
URL: http://svn.apache.org/r1491443
Log:
Updated the connection wrapper to the latest way to use the Apache Directory LDAP API in the case of a Start TLS connection.
Modified:
directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java
Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java?rev=1491443&r1=1491442&r2=1491443&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java (original)
+++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java Mon Jun 10 13:21:10 2013
@@ -189,6 +189,7 @@ public class DirectoryApiConnectionWrapp
|| ( connection.getEncryptionMethod() == EncryptionMethod.START_TLS ) )
{
ldapConnectionConfig.setUseSsl( connection.getEncryptionMethod() == EncryptionMethod.LDAPS );
+ ldapConnectionConfig.setUseTls( connection.getEncryptionMethod() == EncryptionMethod.START_TLS );
try
{
@@ -229,12 +230,6 @@ public class DirectoryApiConnectionWrapp
{
throw new Exception( Messages.DirectoryApiConnectionWrapper_UnableToConnect );
}
-
- // Start TLS
- if ( connection.getConnectionParameter().getEncryptionMethod() == ConnectionParameter.EncryptionMethod.START_TLS )
- {
- ldapConnection.startTls();
- }
}
catch ( Exception e )
{