From 51ef33bebdaa4f8df31131374fce8433c431c298 Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Wed, 16 Sep 2009 10:26:07 +0000
Subject: [PATCH] Fix a regression introduced by fix for 4223 During the creation of a replicationServerDomain, wait for the replication server to connect to other replication servers only if the creation was initiated by a directory server.
---
opends/src/server/org/opends/server/replication/server/MessageHandler.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/MessageHandler.java b/opends/src/server/org/opends/server/replication/server/MessageHandler.java
index c8395f8..9025357 100644
--- a/opends/src/server/org/opends/server/replication/server/MessageHandler.java
+++ b/opends/src/server/org/opends/server/replication/server/MessageHandler.java
@@ -239,15 +239,32 @@
/**
* Returns the Replication Server Domain to which belongs this handler.
- * @param createIfNotExist Creates the domain if it does not exist.
+ *
+ * @param createIfNotExist Creates the domain if it does not exist.
+ *
* @return The replication server domain.
*/
public ReplicationServerDomain getDomain(boolean createIfNotExist)
{
+ return getDomain(createIfNotExist, false);
+ }
+
+ /**
+ * Returns the Replication Server Domain to which belongs this handler.
+ *
+ * @param createIfNotExist Creates the domain if it does not exist.
+ * @param waitConnections Waits for the Connections with other RS to
+ * be established before returning.
+ * @return The replication server domain.
+ */
+ public ReplicationServerDomain getDomain(
+ boolean createIfNotExist, boolean waitConnections)
+ {
if (replicationServerDomain==null)
{
replicationServerDomain =
- replicationServer.getReplicationServerDomain(serviceId,createIfNotExist);
+ replicationServer.getReplicationServerDomain(
+ serviceId, createIfNotExist, waitConnections);
}
return replicationServerDomain;
}
--
Gitblit v1.10.0