From 476b8298f1e824e6eeb459b23874b71db2e61439 Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Mon, 26 Mar 2007 20:58:23 +0000
Subject: [PATCH] Update the Directory Server initialization process so that the call to enable the admin class loader happens as part of initializing the configuration rather than bootstrapping the server. This will make it play better with other utilities (like the LDIF import and export tools) that need to access the server configuration but do not call bootstrapServer().
---
opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java b/opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java
index 32774b1..f6ec02f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java
@@ -738,10 +738,6 @@
pluginConfigManager = new PluginConfigManager();
- // Make sure that administration framework definition classes are loaded.
- ClassLoaderProvider.getInstance().enable();
-
-
// If we have gotten here, then the configuration should be properly
// bootstrapped.
synchronized (directoryServer)
@@ -810,6 +806,14 @@
this.configFile = configFile;
+ // Make sure that administration framework definition classes are loaded.
+ ClassLoaderProvider provider = ClassLoaderProvider.getInstance();
+ if (! provider.isEnabled())
+ {
+ provider.enable();
+ }
+
+
// Load and instantiate the configuration handler class.
Class handlerClass;
try
--
Gitblit v1.10.0