From bb96ac6156a17994bcf38c09ead082e63baa79fe Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Mon, 03 Sep 2007 07:41:30 +0000
Subject: [PATCH] Fix for issue 2159.
---
opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallReviewPanel.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallReviewPanel.java b/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallReviewPanel.java
index b6a99bb..d4cfe80 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallReviewPanel.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallReviewPanel.java
@@ -34,6 +34,7 @@
import org.opends.admin.ads.ServerDescriptor;
import org.opends.admin.ads.SuffixDescriptor;
import org.opends.quicksetup.UserData;
+import org.opends.quicksetup.installer.AuthenticationData;
import org.opends.quicksetup.installer.DataReplicationOptions;
import org.opends.quicksetup.installer.NewSuffixOptions;
import org.opends.quicksetup.installer.SuffixesToReplicateOptions;
@@ -360,15 +361,35 @@
SuffixesToReplicateOptions.Type.REPLICATE_WITH_EXISTING_SUFFIXES) &&
remotePorts.size() > 0)
{
+ String serverToConnectDisplay;
+ AuthenticationData authData =
+ userInstallData.getReplicationOptions().getAuthenticationData();
+ if (userInstallData != null)
+ {
+ serverToConnectDisplay = authData.getHostName()+":"+authData.getPort();
+ }
+ else
+ {
+ serverToConnectDisplay = "";
+ }
buf.append(String.valueOf(
userInstallData.getReplicationOptions()
.getReplicationPort()));
TreeSet<Message> remoteServerLines = new TreeSet<Message>();
for (ServerDescriptor server : remotePorts.keySet())
{
+ String serverDisplay;
+ if (server.getHostPort(false).equalsIgnoreCase(serverToConnectDisplay))
+ {
+ serverDisplay = serverToConnectDisplay;
+ }
+ else
+ {
+ serverDisplay = server.getHostPort(true);
+ }
remoteServerLines.add(INFO_REMOTE_SERVER_REPLICATION_PORT.get(
String.valueOf(remotePorts.get(server)),
- server.getHostPort(true)));
+ serverDisplay));
}
for (Message line : remoteServerLines)
{
--
Gitblit v1.10.0