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/ServerHealthChecker.java |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/ServerHealthChecker.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/ServerHealthChecker.java
index e3f0022..7a9fe2d 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/ServerHealthChecker.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/ServerHealthChecker.java
@@ -78,16 +78,14 @@
       if (installation.getStatus().isServerRunning()) {
         new ServerController(installation).stopServer(true);
       }
-      OperationOutput op = control.startServer(true);
+      OperationOutput op = control.startServer(false);
       errors = op.getErrorMessages(UNHEALTHY_SERVER_LOG_REGEX);
     } catch (Exception e) {
       if (e instanceof ApplicationException) {
         throw (ApplicationException)e;
       } else {
         throw new ApplicationException(ApplicationException.Type.APPLICATION,
-                "Server health check failed.  Please resolve the following " +
-                        "before running the upgrade " +
-                        "tool: " + e.getLocalizedMessage(), e);
+                "Server health check failed: " + e.getLocalizedMessage(), e);
       }
     } finally {
       if (control != null) {

--
Gitblit v1.10.0