From 756655dc0c1de4e46da6a050d4031c2c30354a83 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.

---
 opends/src/server/org/opends/server/replication/server/ECLServerHandler.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/opends/src/server/org/opends/server/replication/server/ECLServerHandler.java b/opends/src/server/org/opends/server/replication/server/ECLServerHandler.java
index 56f18fb..456f37f 100644
--- a/opends/src/server/org/opends/server/replication/server/ECLServerHandler.java
+++ b/opends/src/server/org/opends/server/replication/server/ECLServerHandler.java
@@ -351,7 +351,7 @@
         replicationServer, rcvWindowSize);
     try
     {
-      setServiceIdAndDomain(ServerConstants.DN_EXTERNAL_CHANGELOG_ROOT);
+      setServiceIdAndDomain(ServerConstants.DN_EXTERNAL_CHANGELOG_ROOT, true);
     }
     catch(DirectoryException de)
     {
@@ -381,7 +381,7 @@
         replicationServer, 0);
     try
     {
-      setServiceIdAndDomain(ServerConstants.DN_EXTERNAL_CHANGELOG_ROOT);
+      setServiceIdAndDomain(ServerConstants.DN_EXTERNAL_CHANGELOG_ROOT, true);
     }
     catch(DirectoryException de)
     {
@@ -673,7 +673,7 @@
           // set initial state
           mh.setInitialServerState(newDomainCtxt.startState);
           // set serviceID and domain
-          mh.setServiceIdAndDomain(rsd.getBaseDn());
+          mh.setServiceIdAndDomain(rsd.getBaseDn(), false);
           // register the unconnected into the domain
           rsd.registerHandler(mh);
           newDomainCtxt.mh = mh;

--
Gitblit v1.10.0