From ea629fa971db08f2267b50522360563a8fec7f86 Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Thu, 27 May 2010 15:28:09 +0000
Subject: [PATCH] Fix for issues #3395 and #3998. The changes improves the replica initialization protocol, especially flow control and handling connection outage.

---
 opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServerHandler.java |   17 ++---------------
 1 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServerHandler.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServerHandler.java
index d98d333..962c9a7 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServerHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServerHandler.java
@@ -689,7 +689,8 @@
             dsInfo.getGroupId(), dsInfo.getStatus(), dsInfo.getRefUrls(),
             dsInfo.isAssured(), dsInfo.getAssuredMode(),
             dsInfo.getSafeDataLevel(),
-            dsInfo.getEclIncludes());
+            dsInfo.getEclIncludes(),
+            dsInfo.getProtocolVersion());
         lsh.startHandler();
         remoteDirectoryServers.put(lsh.getServerId(), lsh);
       }
@@ -843,20 +844,6 @@
   }
 
   /**
-   * Sends a message containing a generationId to a peer server.
-   * The peer is expected to be a replication server.
-   *
-   * @param  msg         The GenerationIdMessage message to be sent.
-   * @throws IOException When it occurs while sending the message,
-   *
-   */
-  public void forwardReplicationMsg(ReplicationMsg msg)
-    throws IOException
-  {
-    session.publish(msg);
-  }
-
-  /**
    * Receives a topology msg.
    * @param topoMsg The message received.
    * @throws DirectoryException when it occurs.

--
Gitblit v1.10.0