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/DataServerHandler.java | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/DataServerHandler.java b/opends/src/server/org/opends/server/replication/server/DataServerHandler.java
index 1eda9a1..65cfa2c 100644
--- a/opends/src/server/org/opends/server/replication/server/DataServerHandler.java
+++ b/opends/src/server/org/opends/server/replication/server/DataServerHandler.java
@@ -418,7 +418,7 @@
heartbeatInterval = serverStartMsg.getHeartbeatInterval();
// generic stuff
- setServiceIdAndDomain(serverStartMsg.getBaseDn());
+ setServiceIdAndDomain(serverStartMsg.getBaseDn(), true);
setInitialServerState(serverStartMsg.getServerState());
setSendWindowSize(serverStartMsg.getWindowSize());
@@ -474,8 +474,6 @@
boolean sessionInitiatorSSLEncryption =
processStartFromRemote(inServerStartMsg);
- // Get or Create the ReplicationServerDomain
- replicationServerDomain = getDomain(true, true);
localGenerationId = replicationServerDomain.getGenerationId();
oldGenerationId = localGenerationId;
--
Gitblit v1.10.0