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/tools/BackendToolUtils.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/BackendToolUtils.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/BackendToolUtils.java
index 2ab9bf7..2de4f79 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/BackendToolUtils.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/BackendToolUtils.java
@@ -29,6 +29,7 @@
import org.opends.server.api.LocalBackend;
import org.opends.server.config.ConfigurationHandler;
import org.opends.server.core.DirectoryServer;
+import org.opends.server.core.ServerContext;
import org.opends.server.types.Attribute;
import org.opends.server.types.Entry;
@@ -66,8 +67,9 @@
try
{
// Iterate through the immediate children, attempting to parse them as backends.
- final RootCfg root = DirectoryServer.getInstance().getServerContext().getRootConfig();
- ConfigurationHandler configHandler = DirectoryServer.getInstance().getServerContext().getConfigurationHandler();
+ ServerContext serverContext = DirectoryServer.getInstance().getServerContext();
+ final RootCfg root = serverContext.getRootConfig();
+ ConfigurationHandler configHandler = serverContext.getConfigurationHandler();
final DN backendBaseDN = getBackendBaseDN();
for (final DN childrenDn : configHandler.getChildren(backendBaseDN))
{
@@ -87,7 +89,7 @@
backend = (LocalBackend) backendClass.newInstance();
backend.setBackendID(backendID);
cfg = root.getBackend(backendID);
- backend.configureBackend(cfg, DirectoryServer.getInstance().getServerContext());
+ backend.configureBackend(cfg, serverContext);
}
catch (final Exception e)
{
--
Gitblit v1.10.0