From 3a85b7fa73c0a50348e7adfcda4af929ce52a30d Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Tue, 25 Sep 2007 07:29:24 +0000
Subject: [PATCH] some replication hardening :  - fix some race conditions in namingConflict test  - add some cleanup at the end of ReplicationServerDynamicConfTest and    IsolationTest  - don't use anymore 2 statics in the replication code that could cause    problem when in-core restart are done.  - improve the shutdown by making sure that all threads are done    before returning

---
 opendj-sdk/opends/src/server/org/opends/server/replication/plugin/MultimasterReplication.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/MultimasterReplication.java b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/MultimasterReplication.java
index d462805..c7adf93 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/MultimasterReplication.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/MultimasterReplication.java
@@ -192,6 +192,7 @@
       MultimasterSynchronizationProviderCfg configuration)
   throws ConfigException
   {
+    domains.clear();
     replicationServerListener = new ReplicationServerListener(configuration);
 
     // Register as an add and delete listener with the root configuration so we
@@ -435,6 +436,7 @@
     {
       domain.shutdown();
     }
+    domains.clear();
 
     // shutdown the ReplicationServer Service if necessary
     if (replicationServerListener != null)

--
Gitblit v1.10.0