From 8cc2cf5fd835417e0e4e136671ae34717542f8a8 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 17 Oct 2013 14:27:16 +0000
Subject: [PATCH] OPENDJ-1116 Introduce abstraction for the changelog DB

---
 opendj-sdk/opends/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java
index 96e81db..c4c614f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java
@@ -498,11 +498,11 @@
   @Override
   public void shutdownDomain(DN baseDN)
   {
-    shutdownReplicaDBs(getDomainMap(baseDN));
-    domainToReplicaDBs.remove(baseDN);
+    shutdownReplicaDBs(baseDN, getDomainMap(baseDN));
   }
 
-  private void shutdownReplicaDBs(Map<Integer, JEReplicaDB> domainMap)
+  private void shutdownReplicaDBs(DN baseDN,
+      Map<Integer, JEReplicaDB> domainMap)
   {
     synchronized (domainMap)
     {
@@ -510,7 +510,7 @@
       {
         replicaDB.shutdown();
       }
-      domainMap.clear();
+      domainToReplicaDBs.remove(baseDN);
     }
   }
 
@@ -562,8 +562,7 @@
           firstException = e;
         }
       }
-      shutdownReplicaDBs(domainMap);
-      domainToReplicaDBs.remove(baseDN);
+      shutdownReplicaDBs(baseDN, domainMap);
     }
 
     // 2- clear the ChangeNumber index DB

--
Gitblit v1.10.0