From 642e1f844e7b37d2d8306c4d4300123f46f85558 Mon Sep 17 00:00:00 2001
From: Fabio Pistolesi <fabio.pistolesi@forgerock.com>
Date: Tue, 24 Feb 2015 13:35:36 +0000
Subject: [PATCH] OPENDJ-1800 Find a better way to manage database prefix names in a Storage
---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/RootContainer.java | 20 +++-----------------
1 files changed, 3 insertions(+), 17 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/RootContainer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/RootContainer.java
index f887025..d9e854a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/RootContainer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/RootContainer.java
@@ -368,9 +368,6 @@
*
* @param baseDN
* The base DN of the entry container to open.
- * @param name
- * The name of the entry container or <CODE>NULL</CODE> to open the
- * default entry container for the given base DN.
* @param txn
* The database transaction
* @return The opened entry container.
@@ -379,21 +376,10 @@
* @throws ConfigException
* If an configuration error occurs while opening the entry container.
*/
- EntryContainer openEntryContainer(DN baseDN, String name, WriteableStorage txn)
+ EntryContainer openEntryContainer(DN baseDN, WriteableStorage txn)
throws StorageRuntimeException, ConfigException
{
- String databasePrefix;
- if (name == null || "".equals(name))
- {
- databasePrefix = baseDN.toIrreversibleReadableString();
- }
- else
- {
- databasePrefix = name;
- }
-
- EntryContainer ec =
- new EntryContainer(baseDN, storage.toSafeSuffixName(databasePrefix), backend, config, storage, this);
+ EntryContainer ec = new EntryContainer(baseDN, backend, config, storage, this);
ec.open(txn);
return ec;
}
@@ -443,7 +429,7 @@
EntryID highestID = null;
for (DN baseDN : baseDNs)
{
- EntryContainer ec = openEntryContainer(baseDN, null, txn);
+ EntryContainer ec = openEntryContainer(baseDN, txn);
EntryID id = ec.getHighestEntryID(txn);
registerEntryContainer(baseDN, ec);
if (highestID == null || id.compareTo(highestID) > 0)
--
Gitblit v1.10.0