From f8ef0eed366445c5a341dbcc7882a7104c1cac1b Mon Sep 17 00:00:00 2001
From: boli <boli@localhost>
Date: Thu, 26 Jul 2007 16:31:34 +0000
Subject: [PATCH] This fixes issue 1971 and allows partial non-append imports of a backend:

---
 opends/src/server/org/opends/server/backends/jeb/DatabaseContainer.java |   28 +++++++++++-----------------
 1 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/opends/src/server/org/opends/server/backends/jeb/DatabaseContainer.java b/opends/src/server/org/opends/server/backends/jeb/DatabaseContainer.java
index 6e62932..131bbaf 100644
--- a/opends/src/server/org/opends/server/backends/jeb/DatabaseContainer.java
+++ b/opends/src/server/org/opends/server/backends/jeb/DatabaseContainer.java
@@ -92,10 +92,7 @@
     this.env = env;
     this.entryContainer = entryContainer;
     this.databases = new CopyOnWriteArrayList<Database>();
-
-    StringBuilder builder = new StringBuilder();
-    buildDatabaseName(builder, name);
-    this.name = builder.toString();
+    this.name = name;
   }
 
   /**
@@ -175,19 +172,6 @@
   }
 
   /**
-   * Constructs a full JE database name incorporating a entryContainer name.
-   *
-   * @param builder A string builder to which the full name will be appended.
-   * @param name    The short database name.
-   */
-  private void buildDatabaseName(StringBuilder builder, String name)
-  {
-    builder.append(entryContainer.getContainerName());
-    builder.append('_');
-    builder.append(name);
-  }
-
-  /**
    * Flush any cached database information to disk and close the
    * database container.
    *
@@ -385,4 +369,14 @@
   {
     return getDatabase().preload(config);
   }
+
+  /**
+   * Set the JE database name to use for this container.
+   *
+   * @param name The database name to use for this container.
+   */
+  void setName(String name)
+  {
+    this.name = name;
+  }
 }

--
Gitblit v1.10.0