From ac2694756d835916dfa2be34b318f26c068bc945 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Tue, 15 Apr 2008 12:28:27 +0000
Subject: [PATCH] Fix for issue 3173 (manage-account does not handle properly the localized 'true' and 'false' values)
---
opendj-sdk/opends/src/server/org/opends/server/tools/ManageAccount.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/ManageAccount.java b/opendj-sdk/opends/src/server/org/opends/server/tools/ManageAccount.java
index 6e7212e..b5e532a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/ManageAccount.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/ManageAccount.java
@@ -1426,7 +1426,6 @@
*/
private static int processSubcommand(ArrayList<ASN1Element> opElements)
{
- int msgID;
SubCommand subCommand = argParser.getSubCommand();
if (subCommand == null)
{
@@ -1455,11 +1454,11 @@
if ((a != null) && a.isPresent())
{
String valueStr = a.getValue();
- if (valueStr.equalsIgnoreCase("true"))
+ if (isTrueValue(valueStr))
{
opElements.add(encode(OP_SET_ACCOUNT_DISABLED_STATE, "true"));
}
- else if (valueStr.equalsIgnoreCase("false"))
+ else if (isFalseValue(valueStr))
{
opElements.add(encode(OP_SET_ACCOUNT_DISABLED_STATE, "false"));
}
@@ -1642,11 +1641,11 @@
if ((a != null) && a.isPresent())
{
String valueStr = a.getValue();
- if (valueStr.equalsIgnoreCase("true"))
+ if (isTrueValue(valueStr))
{
opElements.add(encode(OP_SET_PASSWORD_RESET_STATE, "true"));
}
- else if (valueStr.equalsIgnoreCase("false"))
+ else if (isFalseValue(valueStr))
{
opElements.add(encode(OP_SET_PASSWORD_RESET_STATE, "false"));
}
@@ -1788,5 +1787,16 @@
}
}
}
+
+ private static boolean isTrueValue(String value)
+ {
+ return INFO_MULTICHOICE_TRUE_VALUE.get().toString().equalsIgnoreCase(value);
+ }
+
+ private static boolean isFalseValue(String value)
+ {
+ return INFO_MULTICHOICE_FALSE_VALUE.get().toString().equalsIgnoreCase(
+ value);
+ }
}
--
Gitblit v1.10.0