From 41bef7c0b619c7bc925326451a56071b5736580a Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Wed, 19 Jun 2013 08:36:16 +0000
Subject: [PATCH] Fix OPENDJ-986: Exception when reading messages from Replication server RS
---
opends/src/server/org/opends/server/replication/service/ReplicationBroker.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/service/ReplicationBroker.java b/opends/src/server/org/opends/server/replication/service/ReplicationBroker.java
index be2db38..7ba4c8e 100644
--- a/opends/src/server/org/opends/server/replication/service/ReplicationBroker.java
+++ b/opends/src/server/org/opends/server/replication/service/ReplicationBroker.java
@@ -31,6 +31,7 @@
import static org.opends.server.loggers.ErrorLogger.logError;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import static org.opends.server.loggers.debug.DebugLogger.getTracer;
+import static org.opends.server.replication.protocol.ProtocolVersion.*;
import static org.opends.server.replication.server.ReplicationServer.*;
import static org.opends.server.util.StaticUtils.*;
@@ -1259,14 +1260,12 @@
{
serverStartMsg = new ServerStartMsg(serverId, url, baseDn,
maxRcvWindow, heartbeatInterval, state,
- ProtocolVersion.getCurrentVersion(),
this.getGenerationID(), isSslEncryption, groupId);
}
else
{
serverStartMsg = new ServerStartECLMsg(url, 0, 0, 0, 0,
maxRcvWindow, heartbeatInterval, state,
- ProtocolVersion.getCurrentVersion(),
this.getGenerationID(), isSslEncryption, groupId);
}
localSession.publish(serverStartMsg);
@@ -1299,8 +1298,8 @@
* replication server will use the same one (or an older one if it is an
* old replication server).
*/
- final short localProtocolVersion = ProtocolVersion
- .minWithCurrent(replServerInfo.getProtocolVersion());
+ final short localProtocolVersion = getCompatibleVersion(replServerInfo
+ .getProtocolVersion());
if (keepConnection)
{
protocolVersion = localProtocolVersion;
--
Gitblit v1.10.0