From ed1a629a316f84a8a9f9d49680f9d2a11aea3034 Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Wed, 16 May 2007 13:20:36 +0000
Subject: [PATCH] use the admin framework facilities to do pattern matchin on the replication server addresses to make sure that it contain both a hostname and a port number.
---
opends/src/server/org/opends/server/replication/plugin/ReplicationBroker.java | 6 +++---
opends/src/server/org/opends/server/replication/server/ReplicationServer.java | 12 ++++++------
opends/src/server/org/opends/server/replication/server/ServerHandler.java | 5 +++--
3 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/plugin/ReplicationBroker.java b/opends/src/server/org/opends/server/replication/plugin/ReplicationBroker.java
index 8319aa1..a6268a4 100644
--- a/opends/src/server/org/opends/server/replication/plugin/ReplicationBroker.java
+++ b/opends/src/server/org/opends/server/replication/plugin/ReplicationBroker.java
@@ -203,9 +203,9 @@
{
for (String server : servers)
{
- String token[] = server.split(":");
- String hostname = token[0];
- String port = token[1];
+ int separator = server.lastIndexOf(':');
+ String port = server.substring(separator + 1);
+ String hostname = server.substring(0, separator);
try
{
diff --git a/opends/src/server/org/opends/server/replication/server/ReplicationServer.java b/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
index fd7a037..219ecc0 100644
--- a/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
+++ b/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
@@ -256,9 +256,9 @@
*/
for (String serverURL : replicationServers)
{
- String token[] = serverURL.split(":");
- String hostname = token[0];
- String port = token[1];
+ int separator = serverURL.lastIndexOf(':');
+ String port = serverURL.substring(separator + 1);
+ String hostname = serverURL.substring(0, separator);
try
{
@@ -305,9 +305,9 @@
*/
private void connect(String serverURL, DN baseDn)
{
- String token[] = serverURL.split(":");
- String hostname = token[0];
- String port = token[1];
+ int separator = serverURL.lastIndexOf(':');
+ String port = serverURL.substring(separator + 1);
+ String hostname = serverURL.substring(0, separator);
try
{
diff --git a/opends/src/server/org/opends/server/replication/server/ServerHandler.java b/opends/src/server/org/opends/server/replication/server/ServerHandler.java
index d2b3d5b..da70bfe 100644
--- a/opends/src/server/org/opends/server/replication/server/ServerHandler.java
+++ b/opends/src/server/org/opends/server/replication/server/ServerHandler.java
@@ -241,8 +241,9 @@
ReplServerStartMessage receivedMsg = (ReplServerStartMessage) msg;
serverId = receivedMsg.getServerId();
serverURL = receivedMsg.getServerURL();
- String[] splittedURL = serverURL.split(":");
- serverAddressURL = session.getRemoteAddress() + ":" + splittedURL[1];
+ int separator = serverURL.lastIndexOf(':');
+ serverAddressURL =
+ session.getRemoteAddress() + ":" + serverURL.substring(separator + 1);
serverIsLDAPserver = false;
this.baseDn = receivedMsg.getBaseDn();
if (baseDn == null)
--
Gitblit v1.10.0