From 24a90f02e573da826c192cca6d6745c2b02ef287 Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Thu, 26 Apr 2007 14:45:34 +0000
Subject: [PATCH] Fixed problems experience while testing upgrader on Windows: - Launcher needs to explicitly call System.exit when the CLI returns a successful code to prevent the CLI from hanging - CurrentInstallStatus.isServerRunning needs to be told the location of the locks directory instead of trying to discern it from the classpath for Web Start upgrader
---
opends/src/quicksetup/org/opends/quicksetup/util/ServerController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/util/ServerController.java b/opends/src/quicksetup/org/opends/quicksetup/util/ServerController.java
index 57d1fbb..6c9e85d 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/util/ServerController.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/util/ServerController.java
@@ -126,7 +126,8 @@
boolean stopped = false;
for (int i = 0; i < nTries && !stopped; i++) {
- stopped = !CurrentInstallStatus.isServerRunning();
+ stopped = !CurrentInstallStatus.isServerRunning(
+ installation.getLocksDirectory());
if (!stopped) {
String msg =
application.getFormattedLog(
--
Gitblit v1.10.0