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/ReplicationServerDomain.java | 9 +--------
1 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerDomain.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
index 440ddb4..208fa2a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
@@ -35,7 +35,6 @@
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import java.util.Set;
import java.util.Timer;
import java.util.TimerTask;
import java.util.concurrent.ConcurrentHashMap;
@@ -1277,13 +1276,7 @@
public UpdateMsg take(ServerHandler sHandler)
{
// Next message can only be taken from connected DSs
- final Set<Integer> connectedReplicaIds = new HashSet<Integer>(getConnectedDSs().keySet());
- if (sHandler.isDataServer())
- {
- // Prevents sending to a DS its own messages
- connectedReplicaIds.remove(sHandler.getServerId());
- }
- return sHandler.take(connectedReplicaIds);
+ return sHandler.take(new HashSet<Integer>(getConnectedDSs().keySet()));
}
/**
--
Gitblit v1.10.0