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/browser/BrowserController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/BrowserController.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/BrowserController.java
index 0042905..7fcdc5e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/BrowserController.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/BrowserController.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.guitools.controlpanel.browser;
@@ -62,8 +62,10 @@
import org.opends.guitools.controlpanel.util.NumSubordinateHacker;
import org.opends.guitools.controlpanel.util.Utilities;
import org.opends.server.config.ConfigConstants;
+import org.opends.server.types.HostPort;
import org.opends.server.types.LDAPURL;
+import static org.opends.admin.ads.util.ConnectionUtils.getPort;
import static org.opends.server.util.ServerConstants.*;
/**
@@ -195,11 +197,9 @@
this.ctxConfiguration = ctxConfiguration;
this.ctxUserData = ctxUserData;
- this.ctxConfiguration.setRequestControls(
- getConfigurationRequestControls());
+ this.ctxConfiguration.setRequestControls(getConfigurationRequestControls());
this.ctxUserData.setRequestControls(getRequestControls());
- rootNodeName = server.getHostname() + ":" +
- ConnectionUtils.getPort(ctxConfiguration);
+ rootNodeName = new HostPort(server.getHostname(), getPort(ctxConfiguration)).toString();
}
else {
rootNodeName = "";
--
Gitblit v1.10.0