Replase use of String ldapUrl by HostPort

Jean-Noël Rouvignac

05.56.2016 c8a1bec908f144ebacb97ba6c591eaf0f47779f6

 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());