From a38fa12cec6fe2f16b4f1e4cb5ca79c86d371e42 Mon Sep 17 00:00:00 2001
From: mrossign <mrossign@localhost>
Date: Mon, 21 Jan 2008 16:36:27 +0000
Subject: [PATCH] Fix for randomly failing replication test (stuck while waiting for some thread death)
---
opends/src/server/org/opends/server/replication/plugin/MultimasterReplication.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/plugin/MultimasterReplication.java b/opends/src/server/org/opends/server/replication/plugin/MultimasterReplication.java
index a69f1b4..73734a3 100644
--- a/opends/src/server/org/opends/server/replication/plugin/MultimasterReplication.java
+++ b/opends/src/server/org/opends/server/replication/plugin/MultimasterReplication.java
@@ -212,13 +212,13 @@
{
ReplicationDomain domain = domains.remove(dn);
+ if (domain != null)
+ domain.shutdown();
+
// No replay threads running if no replication need
if (domains.size() == 0) {
stopReplayThreads();
}
-
- if (domain != null)
- domain.shutdown();
}
/**
@@ -507,9 +507,6 @@
@Override
public void finalizeSynchronizationProvider()
{
- // Stop replay threads
- stopReplayThreads();
-
// shutdown all the domains
for (ReplicationDomain domain : domains.values())
{
@@ -517,6 +514,9 @@
}
domains.clear();
+ // Stop replay threads
+ stopReplayThreads();
+
// shutdown the ReplicationServer Service if necessary
if (replicationServerListener != null)
replicationServerListener.shutdown();
--
Gitblit v1.10.0