From b19ae6bcf067bb426cc404398c9491634b00c050 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 10 Jul 2014 15:36:31 +0000
Subject: [PATCH] OPENDJ-1453 (CR-3870) Replica offline messages should be synced with updates
---
opendj3-server-dev/src/server/org/opends/server/replication/server/ECLServerHandler.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/ECLServerHandler.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/ECLServerHandler.java
index 81c06fc..e756e03 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/ECLServerHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/ECLServerHandler.java
@@ -228,7 +228,13 @@
{
final UpdateMsg newMsg = mh.getNextMessage(false /* non blocking */);
- if (newMsg == null)
+ if (newMsg instanceof ReplicaOfflineMsg)
+ {
+ // and ReplicaOfflineMsg cannot be returned to a search on cn=changelog
+ // proceed as if it was never returned
+ continue;
+ }
+ else if (newMsg == null)
{ // in non blocking mode, null means no more messages
return null;
}
--
Gitblit v1.10.0