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/je/JEChangelogDB.java |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/opends/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java b/opends/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java
index e1dbcd3..fb9cad9 100644
--- a/opends/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java
+++ b/opends/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java
@@ -462,12 +462,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);
@@ -555,6 +549,11 @@
     Map<Integer, JEReplicaDB> 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