From 07572b1a1f310425277e769bc497f2256121f192 Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Tue, 15 May 2007 20:32:42 +0000
Subject: [PATCH] This commit removes the Web Start version of the upgrader's ability to download arbitrary builds to be used for upgrading. Instead, the Web Start version of upgrade will be tied to the build version of upgrader. This is necessary after discovering that attemping to perform internal communication with the directory server when the DS bit and the upgraders bits are of different versions is problematic.
---
opends/src/quicksetup/org/opends/quicksetup/util/ServerHealthChecker.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/util/ServerHealthChecker.java b/opends/src/quicksetup/org/opends/quicksetup/util/ServerHealthChecker.java
index 082b66a..78f09b1 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/util/ServerHealthChecker.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/util/ServerHealthChecker.java
@@ -72,9 +72,9 @@
* @throws ApplicationException if things go wrong
*/
public void checkServer() throws ApplicationException {
- InProcessServerController control =
- new InProcessServerController(installation);
+ InProcessServerController control = null;
try {
+ control = new InProcessServerController(installation);
if (installation.getStatus().isServerRunning()) {
new ServerController(installation).stopServer();
}
@@ -90,7 +90,9 @@
"tool: " + e.getLocalizedMessage(), e);
}
} finally {
- control.stopServer();
+ if (control != null) {
+ control.stopServer();
+ }
}
}
--
Gitblit v1.10.0