mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

Yannick Lecaillez
22.15.2015 6496d55886b065e8af5c2c4b6d07fe0dfffae813
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java
@@ -1721,19 +1721,16 @@
    {
      options = new LDAPConnectionOptions();
    }
    options.setUseSSL(state.useSSL);
    options.setStartTLS(state.useStartTLS);
    if (state.useSSL)
    {
      options.setUseSSL(true);
      SSLConnectionFactory sslConnectionFactory = new SSLConnectionFactory();
      sslConnectionFactory.init(getTrustManager() == null, state.keystorePath,
          state.keystorePassword, state.certifNickname, state.truststorePath, state.truststorePassword);
      options.setSSLConnectionFactory(sslConnectionFactory);
    }
    else
    {
      options.setUseSSL(false);
    }
    options.setStartTLS(!state.useStartTLS);
    return options;
  }