From 7dd2936dda1c7a52fc65b40876be53c928e1bbce Mon Sep 17 00:00:00 2001
From: lutoff <lutoff@localhost>
Date: Fri, 09 Nov 2007 10:44:38 +0000
Subject: [PATCH] BooleanArgument doesn't accept call to valueIsAcceptable
---
opends/src/server/org/opends/server/util/args/SubCommandArgumentParser.java | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/opends/src/server/org/opends/server/util/args/SubCommandArgumentParser.java b/opends/src/server/org/opends/server/util/args/SubCommandArgumentParser.java
index 970ff0d..b28c9bc 100644
--- a/opends/src/server/org/opends/server/util/args/SubCommandArgumentParser.java
+++ b/opends/src/server/org/opends/server/util/args/SubCommandArgumentParser.java
@@ -1266,14 +1266,22 @@
String value = argumentProperties.getProperty(a.getPropertyName()
.toLowerCase());
MessageBuilder invalidReason = new MessageBuilder();
- if ( (value != null) && (a.valueIsAcceptable(value, invalidReason)))
+ if (value != null)
{
- a.addValue(value);
- if (a.needsValue())
+ Boolean addValue = true;
+ if (!( a instanceof BooleanArgument))
{
- a.setPresent(true);
+ addValue = a.valueIsAcceptable(value, invalidReason);
}
- a.setValueSetByProperty(true);
+ if (addValue)
+ {
+ a.addValue(value);
+ if (a.needsValue())
+ {
+ a.setPresent(true);
+ }
+ a.setValueSetByProperty(true);
+ }
}
}
}
@@ -1312,14 +1320,22 @@
String value = argumentProperties.getProperty(a.getPropertyName()
.toLowerCase());
MessageBuilder invalidReason = new MessageBuilder();
- if ((value != null) && (a.valueIsAcceptable(value, invalidReason)))
+ if (value != null)
{
- a.addValue(value);
- if (a.needsValue())
+ Boolean addValue = true;
+ if (!( a instanceof BooleanArgument))
{
- a.setPresent(true);
+ addValue = a.valueIsAcceptable(value, invalidReason);
}
- a.setValueSetByProperty(true);
+ if (addValue)
+ {
+ a.addValue(value);
+ if (a.needsValue())
+ {
+ a.setPresent(true);
+ }
+ a.setValueSetByProperty(true);
+ }
}
}
}
--
Gitblit v1.10.0