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