From 7efcfb8936b64d492be5c85f232c9dc39006456d Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Wed, 20 Feb 2008 13:32:35 +0000
Subject: [PATCH] Fix for issue 2972 (The usage of stop-ds.bat shows the class name)

---
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeLauncher.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeLauncher.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeLauncher.java
index b230815..2381550 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeLauncher.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeLauncher.java
@@ -305,7 +305,10 @@
     } else {
       scriptName = Installation.UNIX_UPGRADE_FILE_NAME;
     }
-    System.setProperty(ServerConstants.PROPERTY_SCRIPT_NAME, scriptName);
+    if (System.getProperty(ServerConstants.PROPERTY_SCRIPT_NAME) == null)
+    {
+      System.setProperty(ServerConstants.PROPERTY_SCRIPT_NAME, scriptName);
+    }
 
     argParser = new ArgumentParser(getClass().getName(),
         INFO_UPGRADE_LAUNCHER_USAGE_DESCRIPTION.get(), false);
@@ -389,6 +392,7 @@
         }
       } catch (ArgumentException ae) {
         System.err.println(ae.getMessageObject());
+        printUsage(false);
         System.exit(ReturnCode.
                 APPLICATION_ERROR.getReturnCode());
       }

--
Gitblit v1.10.0