From 5b2a1411644980f10b6d826155752f85e40bdd78 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 25 Sep 2013 08:39:41 +0000
Subject: [PATCH] OPENDJ-1134 (CR-2355) Introduce a class in replication for encapsulating host+port combinations
---
opends/src/server/org/opends/server/replication/server/ReplicationServerHandler.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/ReplicationServerHandler.java b/opends/src/server/org/opends/server/replication/server/ReplicationServerHandler.java
index 2e0dba9..6d0a6fd 100644
--- a/opends/src/server/org/opends/server/replication/server/ReplicationServerHandler.java
+++ b/opends/src/server/org/opends/server/replication/server/ReplicationServerHandler.java
@@ -82,8 +82,7 @@
generationId = inReplServerStartMsg.getGenerationId();
serverId = inReplServerStartMsg.getServerId();
serverURL = inReplServerStartMsg.getServerURL();
- final int port = HostPort.valueOf(serverURL).getPort();
- serverAddressURL = session.getRemoteAddress() + ":" + port;
+ serverAddressURL = toServerAddressURL(serverURL);
DN baseDN = DN.decode(inReplServerStartMsg.getBaseDn());
setBaseDNAndDomain(baseDN, false);
setInitialServerState(inReplServerStartMsg.getServerState());
@@ -105,6 +104,13 @@
return inReplServerStartMsg.getSSLEncryption();
}
+ private String toServerAddressURL(String serverURL)
+ {
+ final int port = HostPort.valueOf(serverURL).getPort();
+ // Ensure correct formatting of IPv6 addresses by using a HostPort instance.
+ return new HostPort(session.getRemoteAddress(), port).toString();
+ }
+
/**
* Sends a start message to the remote RS.
*
--
Gitblit v1.10.0