From 7a3e37d3c720eea18a620fe19a8e94ae299ea0a6 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Tue, 02 Dec 2014 15:56:35 +0000
Subject: [PATCH] OPENDJ-1611 Check serverState before returning a message
---
opendj-sdk/opends/src/server/org/opends/server/replication/server/MessageHandler.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/MessageHandler.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/MessageHandler.java
index ac7ce11..fe69dda 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/MessageHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/server/MessageHandler.java
@@ -329,8 +329,10 @@
following = true;
lateQueue.clear();
msgQueue.consumeUpTo(msg);
- updateServerState(msg);
- return msg;
+ if (updateServerState(msg))
+ {
+ return msg;
+ }
}
}
}
@@ -343,8 +345,11 @@
{
msg = lateQueue.removeFirst();
}
- updateServerState(msg);
- return msg;
+ if (updateServerState(msg))
+ {
+ return msg;
+ }
+ continue;
}
}
--
Gitblit v1.10.0