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

diff --git a/opends/src/quicksetup/org/opends/quicksetup/Launcher.java b/opends/src/quicksetup/org/opends/quicksetup/Launcher.java
index 607b803..5be6d60 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/Launcher.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/Launcher.java
@@ -239,10 +239,7 @@
     if (shouldPrintUsage()) {
       printUsage();
     } else if (isCli()) {
-      int exitCode = launchCli(args, createCliApplication());
-      if (exitCode != 0) {
-        System.exit(exitCode);
-      }
+      System.exit(launchCli(args, createCliApplication()));
     } else {
       willLaunchGui();
       int exitCode = launchGui(args);

--
Gitblit v1.10.0