From 4fe1767665733394131391080c5c101738a6651c Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Tue, 03 Mar 2015 23:18:53 +0000
Subject: [PATCH] Minor pluggable backend code cleanup:

---
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/RootContainer.java |   11 ++++-------
 1 files changed, 4 insertions(+), 7 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 716ff46..f13de4c 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
@@ -129,7 +129,7 @@
   private Storage storage;
 
   /** The backend to which this entry root container belongs. */
-  private final BackendImpl backend;
+  private final BackendImpl<?> backend;
   /** The backend configuration. */
   private final PluggableBackendCfg config;
   /** The database environment monitor for this JE environment. */
@@ -154,7 +154,7 @@
    *          A reference to the JE back end that is creating this root
    *          container.
    */
-  RootContainer(BackendImpl backend, PluggableBackendCfg config)
+  RootContainer(BackendImpl<?> backend, PluggableBackendCfg config)
   {
     this.backend = backend;
     this.config = config;
@@ -194,9 +194,7 @@
     {
       try
       {
-        Storage storage = backend.newStorageInstance();
-        storage.initialize(config);
-        storage.removeStorageFiles();
+        backend.getStorage().removeStorageFiles();
       }
       catch (Exception e)
       {
@@ -344,8 +342,7 @@
   {
     try
     {
-      storage = backend.newStorageInstance();
-      storage.initialize(config);
+      storage = backend.getStorage();
       storage.open();
       storage.write(new WriteOperation()
       {

--
Gitblit v1.10.0