From 0bee4dc38f118fd9941f085f5194a8b1d4c66d5a Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Tue, 02 Dec 2014 16:29:06 +0000
Subject: [PATCH] OPENDJ-1611 CR-5492 Filter replicaIds when filling late queue in MessageHandler
---
opendj3-server-dev/src/server/org/opends/server/replication/server/ServerHandler.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/ServerHandler.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/ServerHandler.java
index 4912593..dfbcaec 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/ServerHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/ServerHandler.java
@@ -31,6 +31,7 @@
import java.util.List;
import java.util.Random;
+import java.util.Set;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
@@ -964,13 +965,15 @@
* Select the next update that must be sent to the server managed by this
* ServerHandler.
*
+ * @param connectedReplicaIds
+ * Ids of replicas to accept when returning a message.
* @return the next update that must be sent to the server managed by this
* ServerHandler.
*/
- public UpdateMsg take()
+ public UpdateMsg take(Set<Integer> connectedReplicaIds)
{
boolean interrupted = true;
- UpdateMsg msg = getNextMessage(true); // synchronous:block until msg
+ UpdateMsg msg = getNextMessage(connectedReplicaIds, true); // synchronous:block until msg
boolean acquired = false;
do
--
Gitblit v1.10.0