From 99480fcbcb68be6a357f6218668feab697e1a93d Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Tue, 07 Jul 2009 14:55:26 +0000
Subject: [PATCH] Fix for 4096 MonitorMsg is not compatible with replication version
---
opends/src/server/org/opends/server/replication/server/DataServerHandler.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 8494127..8a2fe99 100644
--- a/opends/src/server/org/opends/server/replication/server/DataServerHandler.java
+++ b/opends/src/server/org/opends/server/replication/server/DataServerHandler.java
@@ -435,13 +435,13 @@
*/
public void registerIntoDomain()
{
- // Alright, connected with new DS: store handler.
+ // All-right, connected with new DS: store handler.
Map<Short, DataServerHandler> connectedDSs =
replicationServerDomain.getConnectedDSs();
connectedDSs.put(serverId, this);
// Tell peer DSs a new DS just connected to us
- // No need to resend topo msg to this just new DS so not null
+ // No need to re-send TopologyMsg to this just new DS so not null
// argument
replicationServerDomain.buildAndSendTopoInfoToDSs(this);
// Tell peer RSs a new DS just connected to us
@@ -499,13 +499,13 @@
ReplServerStartMsg outReplServerStartMsg = null;
try
{
- outReplServerStartMsg = sendStartToRemote((short)-1);
+ outReplServerStartMsg = sendStartToRemote(protocolVersion);
// log
logStartHandshakeRCVandSND(inServerStartMsg, outReplServerStartMsg);
// The session initiator decides whether to use SSL.
- // Until here session is encrypted then it depends on the negociation
+ // Until here session is encrypted then it depends on the negotiation
if (!sessionInitiatorSSLEncryption)
session.stopEncryption();
@@ -524,7 +524,7 @@
// aborted after handshake phase one from a DS that is searching for
// best suitable RS.
- // don't log a poluting error when connection aborted
+ // don't log a polluting error when connection aborted
// from a DS that wanted only to perform handshake phase 1 in order
// to determine the best suitable RS:
// 1) -> ServerStartMsg
--
Gitblit v1.10.0