From 97f7d39cf58d120fc84c99c20bdb36ae35476ab3 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 04 Apr 2016 13:38:35 +0000
Subject: [PATCH] Use HostPort throughout
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/Task.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/Task.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/Task.java
index d5df37e..d2e7a4f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/Task.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/Task.java
@@ -52,6 +52,7 @@
import org.opends.quicksetup.Installation;
import org.opends.quicksetup.UserData;
import org.forgerock.opendj.ldap.DN;
+import org.opends.server.types.HostPort;
import org.opends.server.types.Schema;
import org.opends.server.util.Base64;
import org.opends.server.util.SetupUtils;
@@ -766,12 +767,12 @@
}
if (isServerRunning() && ctx != null)
{
+ HostPort hostPort = ConnectionUtils.getHostPort(ctx);
String hostName = localHostName;
if (hostName == null || !getInfo().getServerDescriptor().isLocal())
{
- hostName = ConnectionUtils.getHostName(ctx);
+ hostName = hostPort.getHost();
}
- int port = ConnectionUtils.getPort(ctx);
boolean isSSL = ConnectionUtils.isSSL(ctx);
boolean isStartTLS = ConnectionUtils.isStartTLS(ctx);
String bindDN = ConnectionUtils.getBindDN(ctx);
@@ -779,7 +780,7 @@
args.add("--hostName");
args.add(hostName);
args.add("--port");
- args.add(String.valueOf(port));
+ args.add(String.valueOf(hostPort.getPort()));
args.add("--bindDN");
args.add(bindDN);
args.add("--bindPassword");
--
Gitblit v1.10.0