From aaf1f09351c43d52009c6b53b93eb153ace8428e Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Mon, 07 Nov 2016 15:05:30 +0000
Subject: [PATCH] OPENDJ-3417 Remove several backend-related methods from DirectoryServer class
---
opendj-server-legacy/src/main/java/org/opends/server/tasks/ImportTask.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tasks/ImportTask.java b/opendj-server-legacy/src/main/java/org/opends/server/tasks/ImportTask.java
index 4c20cd2..37fccc6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tasks/ImportTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tasks/ImportTask.java
@@ -42,6 +42,7 @@
import org.opends.server.api.ClientConnection;
import org.opends.server.backends.task.Task;
import org.opends.server.backends.task.TaskState;
+import org.opends.server.core.BackendConfigManager;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.LockFileManager;
import org.opends.server.tools.makeldif.TemplateFile;
@@ -282,7 +283,7 @@
if(backendID != null)
{
- backend = DirectoryServer.getBackend(backendID);
+ backend = getServerContext().getBackendConfigManager().getLocalBackend(backendID);
if (backend == null)
{
LocalizableMessage message = ERR_LDIFIMPORT_NO_BACKENDS_FOR_ID.get();
@@ -297,9 +298,10 @@
else
{
// Find the backend that includes all the branches.
+ BackendConfigManager backendConfigManager = getServerContext().getBackendConfigManager();
for(DN includeBranch : includeBranches)
{
- LocalBackend<?> locatedBackend = DirectoryServer.getLocalBackend(includeBranch);
+ LocalBackend<?> locatedBackend = backendConfigManager.getLocalBackend(includeBranch);
if(locatedBackend != null)
{
if(backend == null)
@@ -439,7 +441,7 @@
if(backendID != null)
{
- backend = DirectoryServer.getBackend(backendID);
+ backend = getServerContext().getBackendConfigManager().getLocalBackend(backendID);
if (backend == null)
{
@@ -455,9 +457,10 @@
else
{
// Find the backend that includes all the branches.
+ BackendConfigManager backendConfigManager = getServerContext().getBackendConfigManager();
for(DN includeBranch : includeBranches)
{
- LocalBackend<?> locatedBackend = DirectoryServer.getLocalBackend(includeBranch);
+ LocalBackend<?> locatedBackend = backendConfigManager.getLocalBackend(includeBranch);
if(locatedBackend != null)
{
if(backend == null)
@@ -714,7 +717,7 @@
// It is necessary to retrieve the backend structure again
// because disabling and enabling it again may have resulted
// in a new backend being registered to the server.
- backend = DirectoryServer.getBackend(backend.getBackendID());
+ backend = getServerContext().getBackendConfigManager().getLocalBackend(backend.getBackendID());
}
catch (DirectoryException e)
{
--
Gitblit v1.10.0