From 97050c54efee9d0cc89afb5fb61b9a1c67f73f6a Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Wed, 16 Nov 2016 19:28:22 +0000
Subject: [PATCH] OPENDJ-3460 Improve management of subordinate backend and naming contexts

---
 opendj-server-legacy/src/main/java/org/opends/server/extensions/SoftReferenceEntryCache.java |   20 ++------------------
 1 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SoftReferenceEntryCache.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SoftReferenceEntryCache.java
index 39386c0..e2d34d5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SoftReferenceEntryCache.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SoftReferenceEntryCache.java
@@ -36,11 +36,11 @@
 import org.forgerock.opendj.config.server.ConfigurationChangeListener;
 import org.forgerock.opendj.server.config.server.EntryCacheCfg;
 import org.forgerock.opendj.server.config.server.SoftReferenceEntryCacheCfg;
-import org.opends.server.api.LocalBackend;
 import org.opends.server.api.DirectoryThread;
 import org.opends.server.api.EntryCache;
 import org.opends.server.api.MonitorData;
 import org.opends.server.core.DirectoryServer;
+import org.opends.server.core.ServerContext;
 import org.opends.server.types.CacheEntry;
 import org.forgerock.opendj.ldap.DN;
 import org.opends.server.types.Entry;
@@ -95,7 +95,7 @@
 
   @Override
   public void initializeEntryCache(
-      SoftReferenceEntryCacheCfg configuration
+      ServerContext serverContext, SoftReferenceEntryCacheCfg configuration
       )
       throws ConfigException, InitializationException
   {
@@ -324,22 +324,6 @@
   }
 
   @Override
-  public void clearSubtree(DN baseDN)
-  {
-    // Determine the backend used to hold the specified base DN and clear it.
-    LocalBackend<?> backend =
-        DirectoryServer.getInstance().getServerContext().getBackendConfigManager().getLocalBackend(baseDN);
-    if (backend == null)
-    {
-      // FIXME -- Should we clear everything just to be safe?
-    }
-    else
-    {
-      clearBackend(backend.getBackendID());
-    }
-  }
-
-  @Override
   public void handleLowMemory()
   {
     // This function should automatically be taken care of by the nature of the

--
Gitblit v1.10.0