From 44b9e159c0312d8f76f4193e8e97e5cccf0497d4 Mon Sep 17 00:00:00 2001
From: Chris Ridd <chris.ridd@forgerock.com>
Date: Fri, 19 Jun 2015 11:31:59 +0000
Subject: [PATCH] CR-7318 OPENDJ-2152 fix boolean properties in tools.properties files
---
opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPSearch.java | 2 +-
opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentParser.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentParser.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentParser.java
index 335703c..c8d7b0e 100644
--- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentParser.java
+++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentParser.java
@@ -1773,8 +1773,8 @@
final String value = argumentProperties.getProperty(a.getPropertyName().toLowerCase());
final LocalizableMessageBuilder invalidReason = new LocalizableMessageBuilder();
if (value != null) {
- boolean addValue = !(a instanceof BooleanArgument)
- && a.valueIsAcceptable(value, invalidReason);
+ boolean addValue = (a instanceof BooleanArgument) ? true
+ : a.valueIsAcceptable(value, invalidReason);
if (addValue) {
a.addValue(value);
if (a.needsValue()) {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPSearch.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPSearch.java
index b30298f..006e253 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPSearch.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPSearch.java
@@ -959,7 +959,7 @@
subEntriesArgument = new BooleanArgument("subEntries",
OPTION_SHORT_SUBENTRIES, OPTION_LONG_SUBENTRIES,
INFO_DESCRIPTION_SUBENTRIES.get());
- useSSL.setPropertyName(OPTION_LONG_SUBENTRIES);
+ subEntriesArgument.setPropertyName(OPTION_LONG_SUBENTRIES);
argParser.addArgument(subEntriesArgument);
effectiveRightsUser =
--
Gitblit v1.10.0