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/CreateSubCommandHandler.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/dsconfig/CreateSubCommandHandler.java b/opends/src/server/org/opends/server/tools/dsconfig/CreateSubCommandHandler.java
index 879ad7d..b58b5dc 100644
--- a/opends/src/server/org/opends/server/tools/dsconfig/CreateSubCommandHandler.java
+++ b/opends/src/server/org/opends/server/tools/dsconfig/CreateSubCommandHandler.java
@@ -1442,10 +1442,11 @@
getCommandBuilder().getArguments());
for (Argument arg : argsCopy)
{
- if (arg.getName().equals(OPTION_DSCFG_LONG_RESET) ||
- arg.getName().equals(OPTION_DSCFG_LONG_REMOVE))
- {
- getCommandBuilder().removeArgument(arg);
+ if (arg != null) {
+ if (arg.getName().equals(OPTION_DSCFG_LONG_RESET) ||
+ arg.getName().equals(OPTION_DSCFG_LONG_REMOVE)) {
+ getCommandBuilder().removeArgument(arg);
+ }
}
}
--
Gitblit v1.10.0