From 5cc7819a32fb230538f958ed89c9090b8eaf6524 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).

---
 opendj-sdk/opends/src/server/org/opends/server/util/args/ArgumentParser.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/args/ArgumentParser.java b/opendj-sdk/opends/src/server/org/opends/server/util/args/ArgumentParser.java
index 5eb1218..c9df556 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/args/ArgumentParser.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/args/ArgumentParser.java
@@ -1173,7 +1173,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