From 2721ee7ac9cf93655cd8945befdaa1ee75dacfdf Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 25 Nov 2016 14:50:11 +0000
Subject: [PATCH] Manual fixes/changes post inlining DirectoryServer.getConfigurationHandler()
---
opendj-server-legacy/src/main/java/org/opends/server/backends/ConfigurationBackend.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/ConfigurationBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/ConfigurationBackend.java
index 0827098..4c63a40 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/ConfigurationBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/ConfigurationBackend.java
@@ -43,9 +43,9 @@
import org.forgerock.opendj.server.config.meta.LocalBackendCfgDefn.WritabilityMode;
import org.forgerock.opendj.server.config.server.BackendCfg;
import org.forgerock.opendj.server.config.server.LocalBackendCfg;
-import org.opends.server.api.LocalBackend;
import org.opends.server.api.Backupable;
import org.opends.server.api.ClientConnection;
+import org.opends.server.api.LocalBackend;
import org.opends.server.backends.ConfigurationBackend.ConfigurationBackendCfg;
import org.opends.server.config.ConfigurationHandler;
import org.opends.server.core.AddOperation;
@@ -205,16 +205,14 @@
*
* @param serverContext
* The server context.
- * @param configurationHandler
- * Contains the configuration entries.
* @throws InitializationException
* If an errors occurs.
*/
- public ConfigurationBackend(ServerContext serverContext, ConfigurationHandler configurationHandler)
+ public ConfigurationBackend(ServerContext serverContext)
throws InitializationException
{
this.serverContext = serverContext;
- this.configurationHandler = configurationHandler;
+ this.configurationHandler = serverContext.getConfigurationHandler();
this.configRootEntry = Converters.to(configurationHandler.getRootEntry());
baseDNs = Collections.singleton(configRootEntry.getName());
--
Gitblit v1.10.0