From ccd66a6d38f7d3a55a4fddd2945d8ab8920b007e 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 Move management of backends and listeners from DirectoryServer to BackendConfigManager
---
opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java b/opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java
index ff9f1dd..a2da17d 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java
@@ -90,6 +90,7 @@
import org.opends.server.core.AddOperation;
import org.opends.server.core.DeleteOperation;
import org.opends.server.core.DirectoryServer;
+import org.opends.server.core.ServerContext;
import org.opends.server.loggers.AccessLogPublisher;
import org.opends.server.loggers.AccessLogger;
import org.opends.server.loggers.DebugLogger;
@@ -812,6 +813,17 @@
DirectoryServer.getInstance().getServerContext().getSchemaHandler().updateSchema(schemaBeforeStartingFakeServer);
}
+ /** Returns the server context. */
+ public static ServerContext getServerContext()
+ {
+ ServerContext serverContext = DirectoryServer.getInstance().getServerContext();
+ if (serverContext == null)
+ {
+ throw new RuntimeException("Server context is null");
+ }
+ return serverContext;
+ }
+
/**
* Shut down the server. This should only be called at the end of the test
* suite and not by any unit tests.
@@ -877,14 +889,15 @@
// is re-enabled, a new backend object is in fact created and old reference
// to memory backend must be invalidated. So to prevent this problem, we
// retrieve the memory backend reference each time before cleaning it.
- MemoryBackend memoryBackend =
- (MemoryBackend)DirectoryServer.getBackend(backendID);
+ MemoryBackend memoryBackend = (MemoryBackend) getServerContext().getBackendConfigManager()
+ .getLocalBackend(backendID);
if (memoryBackend == null)
{
memoryBackend = new MemoryBackend();
memoryBackend.setBackendID(backendID);
memoryBackend.setBaseDNs(baseDN);
+ memoryBackend.configureBackend(null, getServerContext());
memoryBackend.openBackend();
DirectoryServer.registerBackend(memoryBackend);
}
--
Gitblit v1.10.0