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/Importer.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Importer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Importer.java
index 13e66e6..0b1aae9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Importer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Importer.java
@@ -110,6 +110,7 @@
import org.opends.server.backends.pluggable.spi.WriteOperation;
import org.opends.server.backends.pluggable.spi.WriteableTransaction;
import org.opends.server.core.DirectoryServer;
+import org.opends.server.core.ServerContext;
import org.opends.server.extensions.DiskSpaceMonitor;
import org.opends.server.types.AttributeType;
import org.opends.server.types.DN;
@@ -192,6 +193,7 @@
private final LDIFImportConfig importConfiguration;
/** Backend configuration. */
private final PersistitBackendCfg backendConfiguration;
+ private final ServerContext serverContext;
/** LDIF reader. */
private ImportLDIFReader reader;
@@ -286,11 +288,12 @@
* @throws ConfigException
* If a problem occurs during initialization.
*/
- Importer(RebuildConfig rebuildConfig, PersistitBackendCfg cfg)
+ Importer(RebuildConfig rebuildConfig, PersistitBackendCfg cfg, ServerContext serverContext)
throws InitializationException, StorageRuntimeException, ConfigException
{
this.importConfiguration = null;
this.backendConfiguration = cfg;
+ this.serverContext = serverContext;
this.tmpEnv = null;
this.threadCount = 1;
this.rebuildManager = new RebuildIndexManager(rebuildConfig, cfg);
@@ -324,12 +327,13 @@
* @throws StorageRuntimeException
* If an error occurred when opening the DB.
*/
- Importer(LDIFImportConfig importConfiguration, PersistitBackendCfg backendCfg)
+ Importer(LDIFImportConfig importConfiguration, PersistitBackendCfg backendCfg, ServerContext serverContext)
throws InitializationException, ConfigException, StorageRuntimeException
{
this.rebuildManager = null;
this.importConfiguration = importConfiguration;
this.backendConfiguration = backendCfg;
+ this.serverContext = serverContext;
if (importConfiguration.getThreadCount() == 0)
{
--
Gitblit v1.10.0