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/ReplicationServerHandler.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/ReplicationServerHandler.java b/opends/src/server/org/opends/server/replication/server/ReplicationServerHandler.java
index d71d11f..2c61852 100644
--- a/opends/src/server/org/opends/server/replication/server/ReplicationServerHandler.java
+++ b/opends/src/server/org/opends/server/replication/server/ReplicationServerHandler.java
@@ -93,7 +93,7 @@
serverAddressURL =
session.getRemoteAddress() + ":" + serverURL.substring(separator +
1);
- setServiceIdAndDomain(inReplServerStartMsg.getBaseDn());
+ setServiceIdAndDomain(inReplServerStartMsg.getBaseDn(), false);
setInitialServerState(inReplServerStartMsg.getServerState());
setSendWindowSize(inReplServerStartMsg.getWindowSize());
if (protocolVersion > ProtocolVersion.REPLICATION_PROTOCOL_V1)
@@ -156,7 +156,7 @@
// the encryption we will request to the peer as we are the session creator
this.initSslEncryption = sslEncryption;
- setServiceIdAndDomain(serviceId);
+ setServiceIdAndDomain(serviceId, false);
localGenerationId = replicationServerDomain.getGenerationId();
oldGenerationId = localGenerationId;
--
Gitblit v1.10.0