From dfbc02e34d557664e8ec66907149f8b7aba18b93 Mon Sep 17 00:00:00 2001
From: Yannick Lecaillez <yannick.lecaillez@forgerock.com>
Date: Fri, 22 May 2015 13:15:40 +0000
Subject: [PATCH] OPENDJ-2042: NullpointerException running manage-task
---
opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java b/opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java
index 08bb46e..449ad8c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java
+++ b/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;
}
--
Gitblit v1.10.0