mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

neil_a_wilson
26.58.2007 476b8298f1e824e6eeb459b23874b71db2e61439
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().

OpenDS Issue Number: 1435
1 files modified
12 ■■■■■ changed files
opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java 12 ●●●●● patch | view | raw | blame | history
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