From c0a5d19fa897c532ced3e13e01f18f869270e9a0 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 26 Mar 2015 16:01:25 +0000
Subject: [PATCH] Pass ServerContext object down method calls to the pluggable backend Importer class.

---
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java
index c106dc5..eb2be4a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java
@@ -641,7 +641,8 @@
 
   /** {@inheritDoc} */
   @Override
-  public LDIFImportResult importLDIF(LDIFImportConfig importConfig) throws DirectoryException
+  public LDIFImportResult importLDIF(LDIFImportConfig importConfig, ServerContext serverContext)
+      throws DirectoryException
   {
     RuntimeInformation.logInfo();
 
@@ -669,7 +670,7 @@
       }
 
       rootContainer = initializeRootContainer();
-      return rootContainer.importLDIF(importConfig);
+      return rootContainer.importLDIF(importConfig, serverContext);
     }
     catch (StorageRuntimeException e)
     {
@@ -764,7 +765,7 @@
 
   /** {@inheritDoc} */
   @Override
-  public void rebuildBackend(RebuildConfig rebuildConfig)
+  public void rebuildBackend(RebuildConfig rebuildConfig, ServerContext serverContext)
       throws InitializationException, ConfigException, DirectoryException
   {
     // If the backend already has the root container open, we must use the same
@@ -787,7 +788,7 @@
       {
         rootContainer = initializeRootContainer();
       }
-      final Importer importer = new Importer(rebuildConfig, (PersistitBackendCfg) cfg); // FIXME JNR remove cast
+      final Importer importer = new Importer(rebuildConfig, (PersistitBackendCfg) cfg, serverContext); // FIXME JNR remove cast
       importer.rebuildIndexes(rootContainer);
     }
     catch (ExecutionException execEx)

--
Gitblit v1.10.0