From 3556ad0275d7271b6533569ac72cb741abdb0b81 Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Thu, 03 Jan 2008 14:00:38 +0000
Subject: [PATCH] fix for 2787 : Replication Server sessions fails when disconnecting and re-connecting When a ReplicationBroker disconnect and reconnect quickly to a Replication Server the reconnection sometimes fails.
---
opends/src/server/org/opends/server/replication/server/ServerReader.java | 49 +------------------------------------------------
1 files changed, 1 insertions(+), 48 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/ServerReader.java b/opends/src/server/org/opends/server/replication/server/ServerReader.java
index 9193c99..323751e 100644
--- a/opends/src/server/org/opends/server/replication/server/ServerReader.java
+++ b/opends/src/server/org/opends/server/replication/server/ServerReader.java
@@ -199,54 +199,7 @@
{
ReplServerInfoMessage infoMsg = (ReplServerInfoMessage)msg;
handler.receiveReplServerInfo(infoMsg);
-
- if (debugEnabled())
- {
- if (handler.isReplicationServer())
- TRACER.debugInfo(
- "In RS " + replicationServerDomain.getReplicationServer().
- getServerId() +
- " Receiving replServerInfo from " + handler.getServerId() +
- " baseDn=" + replicationServerDomain.getBaseDn() +
- " genId=" + infoMsg.getGenerationId());
- }
-
- if (replicationServerDomain.getGenerationId()<0)
- {
- // Here is the case where a ReplicationServer receives from
- // another ReplicationServer the generationId for a domain
- // for which the generation ID has never been set.
- replicationServerDomain.
- setGenerationId(infoMsg.getGenerationId(),false);
- }
- else
- {
- if (infoMsg.getGenerationId()<0)
- {
- // Here is the case where another ReplicationServer
- // signals that it has no generationId set for the domain.
- // If we have generationId set locally and no server currently
- // connected for that domain in the topology then we may also
- // reset the generationId localy.
- replicationServerDomain.mayResetGenerationId();
- }
-
- if (replicationServerDomain.getGenerationId() !=
- infoMsg.getGenerationId())
- {
- Message message = NOTE_BAD_GENERATION_ID.get(
- replicationServerDomain.getBaseDn().toNormalizedString(),
- Short.toString(handler.getServerId()),
- Long.toString(infoMsg.getGenerationId()),
- Long.toString(replicationServerDomain.getGenerationId()));
-
- ErrorMessage errorMsg = new ErrorMessage(
- replicationServerDomain.getReplicationServer().getServerId(),
- handler.getServerId(),
- message);
- session.publish(errorMsg);
- }
- }
+ replicationServerDomain.receiveReplServerInfo(infoMsg, handler);
}
else if (msg instanceof MonitorRequestMessage)
{
--
Gitblit v1.10.0