From b531af710f30dbd69732f9803a55dd2c91f9d055 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Mon, 23 Nov 2015 23:08:23 +0000
Subject: [PATCH] OPENDJ-1607 Merge HeartBeatConnectionFactory and AuthenticatedConnectionFactory into LDAPConnectionFactory
---
opendj-server-legacy/src/main/java/org/opends/server/tools/status/StatusCli.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/status/StatusCli.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/status/StatusCli.java
index 34f661a..3fc1033 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/status/StatusCli.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/status/StatusCli.java
@@ -71,6 +71,7 @@
import org.forgerock.opendj.ldap.SSLContextBuilder;
import org.forgerock.opendj.ldap.TrustManagers;
import org.forgerock.util.Options;
+import org.forgerock.util.time.Duration;
import org.opends.admin.ads.util.ApplicationTrustManager;
import org.opends.guitools.controlpanel.datamodel.BackendDescriptor;
import org.opends.guitools.controlpanel.datamodel.BaseDNDescriptor;
@@ -1174,8 +1175,7 @@
// This connection should always be secure. useSSL = true.
Connection connection = null;
final Options options = Options.defaultOptions();
- options.set(CONNECT_TIMEOUT_IN_MILLISECONDS,
- TimeUnit.MILLISECONDS.toMillis((long) ci.getConnectTimeout()));
+ options.set(CONNECT_TIMEOUT, new Duration((long) ci.getConnectTimeout(), TimeUnit.MILLISECONDS));
LDAPConnectionFactory factory = null;
while (true)
{
@@ -1184,7 +1184,7 @@
final SSLContextBuilder sslBuilder = new SSLContextBuilder();
sslBuilder.setTrustManager(trustManager == null ? TrustManagers.trustAll() : trustManager);
sslBuilder.setKeyManager(keyManager);
- options.set(USE_STARTTLS, ci.useStartTLS());
+ options.set(SSL_USE_STARTTLS, ci.useStartTLS());
options.set(SSL_CONTEXT, sslBuilder.getSSLContext());
factory = new LDAPConnectionFactory(hostName, portNumber, options);
--
Gitblit v1.10.0