From c02dd7f87e9ba574f06e5cc1eb36ebeb76b9f446 Mon Sep 17 00:00:00 2001
From: mrossign <mrossign@localhost>
Date: Thu, 08 Oct 2009 16:02:17 +0000
Subject: [PATCH] - Addition of ReplServerStartDSMsg now sent to a DS connecting to a RS in handshake phase instead of a ReplServerStartMsg. ReplServerStartDSMsg contains same thing as ReplServerStartMsg but also contains
---
opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java | 30 +++---------------------------
1 files changed, 3 insertions(+), 27 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
index 8d3b4a7..a301fc3 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
@@ -1554,20 +1554,8 @@
// in the topology.
if (senderHandler.isDataServer())
{
- MonitorMsg returnMsg;
-
- if (senderHandler.getProtocolVersion() >
- ProtocolVersion.REPLICATION_PROTOCOL_V1)
- {
- returnMsg =
+ MonitorMsg returnMsg =
new MonitorMsg(msg.getDestination(), msg.getsenderID());
- }
- else
- {
- returnMsg =
- new MonitorMsg(msg.getDestination(), msg.getsenderID(),
- ProtocolVersion.REPLICATION_PROTOCOL_V1);
- }
try
{
@@ -1613,20 +1601,8 @@
return;
}
- MonitorMsg monitorMsg;
-
- if (senderHandler.getProtocolVersion() >
- ProtocolVersion.REPLICATION_PROTOCOL_V1)
- {
- monitorMsg =
- new MonitorMsg(msg.getDestination(), msg.getsenderID());
- }
- else
- {
- monitorMsg =
- new MonitorMsg(msg.getDestination(), msg.getsenderID(),
- ProtocolVersion.REPLICATION_PROTOCOL_V1);
- }
+ MonitorMsg monitorMsg =
+ new MonitorMsg(msg.getDestination(), msg.getsenderID());
// Populate for each connected LDAP Server
// from the states stored in the serverHandler.
--
Gitblit v1.10.0