From 0d3aa40c87adbaeaf549e4b0df81048f15e984d0 Mon Sep 17 00:00:00 2001
From: lutoff <lutoff@localhost>
Date: Fri, 09 Nov 2007 09:25:46 +0000
Subject: [PATCH] Fix for issue #2574 (properties file do not take bindPasswordFile into account) In some cases, "addValue" method is not 'self-contained'. The "valueIsAcceptable' method has to be called before "addValue" (and has some mandatory side effect, in FileBaedArgument at least).
---
opends/src/server/org/opends/server/util/args/SubCommandArgumentParser.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 54fe16c..970ff0d 100644
--- a/opends/src/server/org/opends/server/util/args/SubCommandArgumentParser.java
+++ b/opends/src/server/org/opends/server/util/args/SubCommandArgumentParser.java
@@ -1265,7 +1265,8 @@
{
String value = argumentProperties.getProperty(a.getPropertyName()
.toLowerCase());
- if (value != null)
+ MessageBuilder invalidReason = new MessageBuilder();
+ if ( (value != null) && (a.valueIsAcceptable(value, invalidReason)))
{
a.addValue(value);
if (a.needsValue())
@@ -1310,7 +1311,8 @@
{
String value = argumentProperties.getProperty(a.getPropertyName()
.toLowerCase());
- if (value != null)
+ MessageBuilder invalidReason = new MessageBuilder();
+ if ((value != null) && (a.valueIsAcceptable(value, invalidReason)))
{
a.addValue(value);
if (a.needsValue())
--
Gitblit v1.10.0