From c8a1bec908f144ebacb97ba6c591eaf0f47779f6 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 08 Aug 2016 07:26:19 +0000
Subject: [PATCH] Replase use of String ldapUrl by HostPort
---
opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java
index ad34cf4..d242585 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java
@@ -72,7 +72,6 @@
import org.opends.admin.ads.ServerDescriptor;
import org.opends.admin.ads.SuffixDescriptor;
import org.opends.admin.ads.TopologyCacheException;
-import org.opends.admin.ads.util.ConnectionUtils;
import org.opends.admin.ads.util.ConnectionWrapper;
import org.opends.quicksetup.Constants;
import org.opends.quicksetup.Installation;
@@ -1586,7 +1585,7 @@
}
for (ServerDescriptor s : userData.getRemoteWithNoReplicationPort().keySet())
{
- if (s.getAdminConnectorURL().equals(server.getAdminConnectorURL()))
+ if (s.getAdminConnectorHostPort().equals(server.getAdminConnectorHostPort()))
{
AuthenticationData remoteRepl = userData.getRemoteWithNoReplicationPort().get(server);
@@ -1760,14 +1759,14 @@
Set<SuffixDescriptor> suffixes = userData.getSuffixesToReplicateOptions().getSuffixes();
AuthenticationData authData = userData.getReplicationOptions().getAuthenticationData();
- String ldapURL = ConnectionUtils.getLDAPUrl(authData.getHostPort(), authData.useSecureConnection());
+ HostPort hostPort = authData.getHostPort();
suffixLoop:
for (SuffixDescriptor suffix : suffixes)
{
for (ReplicaDescriptor replica : suffix.getReplicas())
{
- if (ldapURL.equalsIgnoreCase(replica.getServer().getAdminConnectorURL()))
+ if (hostPort.equals(replica.getServer().getAdminConnectorHostPort()))
{
// This is the server we're configuring
Set<DN> baseDNs = hm.get(replica.getServer());
--
Gitblit v1.10.0