From 73d9224a1711aadb8cdeb11572e3230e67a2aeed Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 21 Aug 2013 16:42:41 +0000
Subject: [PATCH] ReplicationServerDomain.java: Fixed test break introduced in r9436.
---
opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java b/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
index 06a2ab7..551f262 100644
--- a/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
+++ b/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
@@ -1511,7 +1511,8 @@
try
{
MonitorMsg monitorMsg = createGlobalTopologyMonitorMsg(
- msg.getDestination(), msg.getSenderID());
+ msg.getDestination(), msg.getSenderID(),
+ domainMonitor.getMonitorData());
msgEmitter.send(monitorMsg);
}
catch (IOException e)
@@ -1648,14 +1649,23 @@
* The destination of this message.
* @return The newly created and filled MonitorMsg. Null if a problem occurred
* during message creation.
+ * @throws InterruptedException
+ * if this thread is interrupted while waiting for a response
*/
public MonitorMsg createGlobalTopologyMonitorMsg(int sender, int destination)
+ throws InterruptedException
+ {
+ return createGlobalTopologyMonitorMsg(sender, destination,
+ domainMonitor.computeDomainMonitorData());
+ }
+
+ private MonitorMsg createGlobalTopologyMonitorMsg(int sender,
+ int destination, ReplicationDomainMonitorData monitorData)
{
final MonitorMsg returnMsg = new MonitorMsg(sender, destination);
returnMsg.setReplServerDbState(getDbServerState());
// Add the server state for each DS and RS currently in the topology.
- final ReplicationDomainMonitorData monitorData = getDomainMonitorData();
for (int replicaId : toIterable(monitorData.ldapIterator()))
{
returnMsg.setServerState(replicaId,
--
Gitblit v1.10.0