From d7d04e6626869b086f61e39e5c05346a765baf7c Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Thu, 17 May 2007 17:54:20 +0000
Subject: [PATCH] This commit addresses a few miscellaneous issues with upgrader:
---
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/InProcessServerController.java | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/InProcessServerController.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/InProcessServerController.java
index 9f35624..b1f3578 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/InProcessServerController.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/InProcessServerController.java
@@ -137,7 +137,7 @@
(disableConnectionHandlers ? "disabled" : "enabled"));
System.setProperty(
"org.opends.server.DisableConnectionHandlers",
- disableConnectionHandlers ? "true" : null);
+ disableConnectionHandlers ? "true" : "false");
return startServer();
}
@@ -179,6 +179,19 @@
try {
+ org.opends.server.core.DirectoryServer directoryServer =
+ org.opends.server.core.DirectoryServer.getInstance();
+
+ // Bootstrap and start the Directory Server.
+ LOG.log(Level.FINER, "Bootstrapping directory server");
+ directoryServer.bootstrapServer();
+
+ LOG.log(Level.FINER, "Initializing configuration");
+ String configClass = "org.opends.server.extensions.ConfigFileHandler";
+ String configPath = Utils.getPath(
+ installation.getCurrentConfigurationFile());
+ directoryServer.initializeConfiguration(configClass, configPath);
+
try {
DebugLogPublisher startupDebugPublisher =
@@ -206,6 +219,7 @@
});
ErrorLogger.addErrorLogPublisher(DN.NULL_DN,
startupErrorPublisher);
+
AccessLogPublisher startupAccessPublisher =
TextAccessLogPublisher.getStartupTextAccessPublisher(
new ServerControllerTextWriter(output) {
@@ -224,19 +238,6 @@
e.toString());
}
- org.opends.server.core.DirectoryServer directoryServer =
- org.opends.server.core.DirectoryServer.getInstance();
-
- // Bootstrap and start the Directory Server.
- LOG.log(Level.FINER, "Bootstrapping directory server");
- directoryServer.bootstrapServer();
-
- LOG.log(Level.FINER, "Initializing configuration");
- String configClass = "org.opends.server.extensions.ConfigFileHandler";
- String configPath = Utils.getPath(
- installation.getCurrentConfigurationFile());
- directoryServer.initializeConfiguration(configClass, configPath);
-
LOG.log(Level.FINER, "Invoking start server");
directoryServer.startServer();
--
Gitblit v1.10.0