From 67405dde9ba213331dab1fc46cb18c485070fd5b Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Fri, 05 Jun 2009 09:04:50 +0000
Subject: [PATCH] svn merge -r5333:5417 https://opends.dev.java.net/svn/opends/branches/b2.0
---
opends/src/server/org/opends/server/tools/dsconfig/DSConfig.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/dsconfig/DSConfig.java b/opends/src/server/org/opends/server/tools/dsconfig/DSConfig.java
index 09812cd..3254f08 100644
--- a/opends/src/server/org/opends/server/tools/dsconfig/DSConfig.java
+++ b/opends/src/server/org/opends/server/tools/dsconfig/DSConfig.java
@@ -552,7 +552,8 @@
* @throws ArgumentException
* If a global argument could not be registered.
*/
- private void initializeGlobalArguments() throws ArgumentException {
+ private void initializeGlobalArguments(String[] args)
+ throws ArgumentException {
if (globalArgumentsInitialized == false) {
verboseArgument = new BooleanArgument("verbose", 'v', "verbose",
INFO_DESCRIPTION_VERBOSE.get());
@@ -634,6 +635,7 @@
// Register any global arguments required by the management
// context factory.
+ factory.setRawArguments(args);
factory.registerGlobalArguments(parser);
globalArgumentsInitialized = true;
@@ -721,7 +723,7 @@
private int run(String[] args) {
// Register global arguments and sub-commands.
try {
- initializeGlobalArguments();
+ initializeGlobalArguments(args);
initializeSubCommands();
} catch (ArgumentException e) {
Message message = ERR_CANNOT_INITIALIZE_ARGS.get(e.getMessage());
--
Gitblit v1.10.0