From 9dc10dec2d5d7f61116f7f647b7cf9596ca77be0 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Fri, 05 Jun 2009 09:04:50 +0000
Subject: [PATCH] svn merge -r5333:5417 https://opends.dev.java.net/svn/opends/branches/b2.0
---
opendj-sdk/opends/src/server/org/opends/server/replication/server/ServerHandler.java | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ServerHandler.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ServerHandler.java
index b6c4e3d..a64ea71 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ServerHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ServerHandler.java
@@ -1875,7 +1875,7 @@
{
try
{
- while (msgQueue.isEmpty())
+ while (msgQueue.isEmpty() && (following == true))
{
msgQueue.wait(500);
if (!activeWriter)
@@ -1885,15 +1885,18 @@
{
return null;
}
- msg = msgQueue.removeFirst();
- if (this.updateServerState(msg))
+ if (following == true)
{
- /*
- * Only push the message if it has not yet been seen
- * by the other server.
- * Otherwise just loop to select the next message.
- */
- return msg;
+ msg = msgQueue.removeFirst();
+ if (this.updateServerState(msg))
+ {
+ /*
+ * Only push the message if it has not yet been seen
+ * by the other server.
+ * Otherwise just loop to select the next message.
+ */
+ return msg;
+ }
}
}
}
--
Gitblit v1.10.0