From 9d5b1c7a628471604be4768f97fcdaf13cf0639f Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 02 Oct 2013 13:45:10 +0000
Subject: [PATCH] OPENDJ-1116 Introduce abstraction for the changelog DB
---
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java
index 4304f01..31a6447 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java
@@ -28,10 +28,7 @@
package org.opends.server.replication;
import java.net.SocketException;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.NoSuchElementException;
+import java.util.*;
import java.util.concurrent.locks.Lock;
import org.opends.messages.Category;
@@ -406,9 +403,6 @@
logError(Message.raw(Category.SYNC, Severity.NOTICE,
" ##### Calling ReplicationTestCase.classCleanUp ##### "));
- // Clean RS databases
- cleanUpReplicationServersDB();
-
removeReplicationServerDB();
cleanConfigEntries();
@@ -487,15 +481,18 @@
*/
protected void removeReplicationServerDB() throws Exception
{
- for (ReplicationServer rs : ReplicationServer.getAllInstances())
- {
- clearChangelogDB(rs);
- rs.getChangelogDB().removeDB();
- }
+ // avoid ConcurrentModificationException
+ remove(new ArrayList<ReplicationServer>(ReplicationServer.getAllInstances()));
}
protected void remove(ReplicationServer... replicationServers) throws Exception
{
+ remove(Arrays.asList(replicationServers));
+ }
+
+ protected void remove(Collection<ReplicationServer> replicationServers)
+ throws Exception
+ {
for (ReplicationServer rs : replicationServers)
{
if (rs != null)
--
Gitblit v1.10.0