From 01e198c6c4c3bbbfe57ebc2f9b749d74c5c781fc Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 13 Jun 2014 20:06:36 +0000
Subject: [PATCH] OPENDJ-1496 (CR-3767) ThreadInterruptedException (JE) when running replication tests
---
opends/src/server/org/opends/server/replication/server/changelog/file/FileChangelogDB.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/changelog/file/FileChangelogDB.java b/opends/src/server/org/opends/server/replication/server/changelog/file/FileChangelogDB.java
index db0c9f3..6013bb6 100644
--- a/opends/src/server/org/opends/server/replication/server/changelog/file/FileChangelogDB.java
+++ b/opends/src/server/org/opends/server/replication/server/changelog/file/FileChangelogDB.java
@@ -49,12 +49,13 @@
import org.opends.server.types.DebugLogLevel;
import org.opends.server.util.StaticUtils;
import org.opends.server.util.TimeThread;
+
import com.forgerock.opendj.util.Pair;
+import static org.opends.messages.ReplicationMessages.*;
import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.util.StaticUtils.*;
-import static org.opends.messages.ReplicationMessages.*;
/**
* Log file implementation of the ChangelogDB interface.
@@ -402,12 +403,6 @@
// - then throw the first encountered exception
ChangelogException firstException = null;
- final ChangeNumberIndexer indexer = cnIndexer.get();
- if (indexer != null)
- {
- indexer.clear();
- }
-
for (DN baseDN : this.domainToReplicaDBs.keySet())
{
removeDomain(baseDN);
@@ -497,6 +492,11 @@
Map<Integer, FileReplicaDB> domainMap = domainToReplicaDBs.get(baseDN);
if (domainMap != null)
{
+ final ChangeNumberIndexer indexer = this.cnIndexer.get();
+ if (indexer != null)
+ {
+ indexer.clear(baseDN);
+ }
synchronized (domainMap)
{
domainMap = domainToReplicaDBs.remove(baseDN);
--
Gitblit v1.10.0