From e441171410dd38341b90da74fc90163d0647ff73 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 01 Dec 2014 10:24:31 +0000
Subject: [PATCH] OPENDJ-1602 New pluggable storage based backend
---
opendj3-server-dev/src/server/org/opends/server/backends/jeb/RootContainer.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/RootContainer.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/RootContainer.java
index b10db20..ab1c9bb 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/RootContainer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/RootContainer.java
@@ -59,7 +59,8 @@
* of the entry containers.
*/
public class RootContainer
- implements ConfigurationChangeListener<LocalDBBackendCfg>
+ implements org.opends.server.backends.pluggable.RootContainer<EntryContainer>,
+ ConfigurationChangeListener<LocalDBBackendCfg>
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -78,7 +79,7 @@
/** The database environment monitor for this JE environment. */
private DatabaseEnvironmentMonitor monitor;
- /** The base DNs contained in this entryContainer. */
+ /** The base DNs contained in this root container. */
private final ConcurrentHashMap<DN, EntryContainer> entryContainers = new ConcurrentHashMap<DN, EntryContainer>();
/** The cached value of the next entry identifier to be assigned. */
@@ -311,7 +312,6 @@
public EntryContainer unregisterEntryContainer(DN baseDN)
{
return entryContainers.remove(baseDN);
-
}
/**
@@ -352,8 +352,7 @@
if (timeLimit > 0)
{
// Get a list of all the databases used by the backend.
- ArrayList<DatabaseContainer> dbList =
- new ArrayList<DatabaseContainer>();
+ ArrayList<DatabaseContainer> dbList = new ArrayList<DatabaseContainer>();
for (EntryContainer ec : entryContainers.values())
{
ec.sharedLock.lock();
@@ -441,10 +440,10 @@
}
/**
- * Close the root entryContainer.
+ * Closes this root container.
*
* @throws DatabaseException If an error occurs while attempting to close
- * the entryContainer.
+ * the root container.
*/
public void close() throws DatabaseException
{
@@ -482,6 +481,13 @@
return entryContainers.values();
}
+ /** {@inheritDoc} */
+ @Override
+ public Map<DN, EntryContainer> getSuffixContainers()
+ {
+ return entryContainers;
+ }
+
/**
* Returns all the baseDNs this root container stores.
*
--
Gitblit v1.10.0