From 0eab55fa49863935bbc81242b7e13fa550fedc6d 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
---
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/IsolationTest.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/IsolationTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/IsolationTest.java
index 7a3284b..301ec7c 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/IsolationTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/IsolationTest.java
@@ -108,8 +108,7 @@
// try a new modify operation on the base entry.
op = conn.processModify(baseDn, generatemods("description", "test"));
- // chek that the operation was successful.
- // check that the update failed.
+ // check that the operation was successfull.
assertEquals(op.getResultCode(), ResultCode.SUCCESS,
op.getAdditionalLogMessage().toString());
}
@@ -119,7 +118,10 @@
MultimasterReplication.deleteDomain(baseDn);
if (replicationPlugin != null)
+ {
+ replicationPlugin.finalizeSynchronizationProvider();
DirectoryServer.deregisterSynchronizationProvider(replicationPlugin);
+ }
}
}
--
Gitblit v1.10.0