DIRAPI-374: Consistify LdapConnectionConfig useTls and useSsl flags
diff --git a/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java b/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
index 08b9395..c5d7c59 100644
--- a/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
+++ b/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
@@ -996,7 +996,13 @@
messageId.set( 0 );
connectionCloseFuture = new CompletableFuture<>();
-
+
+ // establish TLS layer if TLS is enabled and SSL is NOT
+ if ( config.isUseTls() && !config.isUseSsl() )
+ {
+ startTls();
+ }
+
// And return
return true;
}
@@ -1623,12 +1629,6 @@
// try to connect, if we aren't already connected.
connect();
- // establish TLS layer if TLS is enabled and SSL is NOT
- if ( config.isUseTls() && !config.isUseSsl() )
- {
- startTls();
- }
-
// If the session has not been establish, or is closed, we get out immediately
checkSession();
