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/replication/server/ReplicationServer.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServer.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServer.java
index f4d646c..e6d3645 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServer.java
@@ -52,6 +52,7 @@
import org.forgerock.opendj.server.config.server.UserDefinedVirtualAttributeCfg;
import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.backends.ChangelogBackend;
+import org.opends.server.core.BackendConfigManager;
import org.opends.server.core.DirectoryServer;
import org.opends.server.crypto.CryptoSuite;
import org.opends.server.replication.common.CSN;
@@ -465,7 +466,9 @@
*/
private void enableExternalChangeLog() throws ConfigException
{
- if (DirectoryServer.hasBackend(ChangelogBackend.BACKEND_ID))
+ BackendConfigManager backendConfigManager =
+ DirectoryServer.getInstance().getServerContext().getBackendConfigManager();
+ if (backendConfigManager.hasLocalBackend(ChangelogBackend.BACKEND_ID))
{
// Backend has already been created and initialized
// This can occurs in tests
@@ -477,7 +480,7 @@
changelogBackend.openBackend();
try
{
- DirectoryServer.registerBackend(changelogBackend);
+ backendConfigManager.registerLocalBackend(changelogBackend);
}
catch (Exception e)
{
@@ -499,7 +502,9 @@
{
if (changelogBackend != null)
{
- DirectoryServer.deregisterBackend(changelogBackend);
+ BackendConfigManager backendConfigManager =
+ DirectoryServer.getInstance().getServerContext().getBackendConfigManager();
+ backendConfigManager.deregisterLocalBackend(changelogBackend);
changelogBackend.finalizeBackend();
changelogBackend = null;
}
--
Gitblit v1.10.0