From 6dee41dc50e9e716c7aac50f0f1bce9047465843 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Mon, 04 Apr 2016 13:38:34 +0000
Subject: [PATCH] Rename config-small.ldif to configForTests/config-small.ldif
---
opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 88b2189..b4787f5 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
@@ -420,10 +420,12 @@
config.setConfigClass(ConfigurationHandler.class);
config.setConfigFile(new File(testConfigDir, "config.ldif"));
- // Initialize the configuration framework for DSConfig.
- ConfigurationFramework.getInstance()
- .initialize(testInstallRoot.getAbsolutePath(),
- testInstanceRoot.getAbsolutePath());
+ ConfigurationFramework configurationFramework = ConfigurationFramework.getInstance();
+ if (!configurationFramework.isInitialized())
+ {
+ configurationFramework.initialize(testInstallRoot.getAbsolutePath(), testInstanceRoot.getAbsolutePath());
+ }
+ configurationFramework.setIsClient(false);
AccessLogger.getInstance().addLogPublisher(
(AccessLogPublisher) getStartupTextAccessPublisher(ACCESS_TEXT_WRITER, false));
--
Gitblit v1.10.0