From 9eb54b5b0e109ecbaee9aa109b32dbf42323bd55 Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Thu, 24 Sep 2009 13:04:28 +0000
Subject: [PATCH] Second try for issue 4223. The first fix was not working because the synchronization code that had been added in the first fix was not called in this case.
---
opendj-sdk/opends/src/server/org/opends/server/replication/server/MessageHandler.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/MessageHandler.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/MessageHandler.java
index 9025357..1ad9574 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/MessageHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/server/MessageHandler.java
@@ -717,10 +717,13 @@
/**
* Set the serviceId (usually baseDn) for this handler. Expected to be done
* once and never changed during the handler life.
- * @param serviceId The provided serviceId.
+ *
+ * @param serviceId The provided serviceId.
+ * @param isDataServer The handler is a dataServer
+ *
* @exception DirectoryException raised when a problem occurs.
*/
- protected void setServiceIdAndDomain(String serviceId)
+ protected void setServiceIdAndDomain(String serviceId, boolean isDataServer)
throws DirectoryException
{
if (this.serviceId != null)
@@ -737,7 +740,7 @@
else
{
this.serviceId = serviceId;
- this.replicationServerDomain = getDomain(true);
+ this.replicationServerDomain = getDomain(true, isDataServer);
}
}
--
Gitblit v1.10.0