From 22ec3dd24c3af40cc6e67318cf83b88e55242d06 Mon Sep 17 00:00:00 2001
From: Chris Ridd <chris.ridd@forgerock.com>
Date: Fri, 18 Jul 2014 08:51:32 +0000
Subject: [PATCH] Forward port fix OPENDJ-1516: Trunk sends MSG_TYPE_REPLICA_OFFLINE messages to a v7 DS
---
opendj3-server-dev/src/server/org/opends/server/replication/protocol/Session.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/protocol/Session.java b/opendj3-server-dev/src/server/org/opends/server/replication/protocol/Session.java
index b6c3c8f..9c1a01c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/protocol/Session.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/protocol/Session.java
@@ -319,6 +319,11 @@
public void publish(final ReplicationMsg msg) throws IOException
{
final byte[] buffer = msg.getBytes(protocolVersion);
+ if (buffer == null)
+ {
+ // skip anything that cannot be encoded for this peer.
+ return;
+ }
if (isRunning.get())
{
while (!closeInitiated)
--
Gitblit v1.10.0