From bb358f2ddbbd5c6bcfce081ed084514772f9fa2e Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Fri, 06 Jul 2007 22:44:21 +0000
Subject: [PATCH] Fix a few cases in which a message was used with an incorrect number of arguments.
---
opendj-sdk/opends/src/server/org/opends/server/messages/ConfigMessages.java | 4 ++--
opendj-sdk/opends/src/server/org/opends/server/config/BooleanConfigAttribute.java | 13 +++++++------
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/config/BooleanConfigAttribute.java b/opendj-sdk/opends/src/server/org/opends/server/config/BooleanConfigAttribute.java
index 4abbb5d..141e088 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/config/BooleanConfigAttribute.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/config/BooleanConfigAttribute.java
@@ -353,7 +353,7 @@
else
{
int msgID = MSGID_CONFIG_ATTR_INVALID_BOOLEAN_VALUE;
- String message = getMessage(msgID, valueString);
+ String message = getMessage(msgID, getName(), valueString);
throw new ConfigException(msgID, message);
}
}
@@ -483,7 +483,7 @@
{
// This is an illegal value.
int msgID = MSGID_CONFIG_ATTR_INVALID_BOOLEAN_VALUE;
- String message = getMessage(msgID, valueString);
+ String message = getMessage(msgID, getName(), valueString);
throw new ConfigException(msgID, message);
}
@@ -547,7 +547,7 @@
{
// This is an illegal value.
int msgID = MSGID_CONFIG_ATTR_INVALID_BOOLEAN_VALUE;
- String message = getMessage(msgID, valueString);
+ String message = getMessage(msgID, getName(), valueString);
throw new ConfigException(msgID, message);
}
@@ -718,15 +718,16 @@
else
{
int msgID = MSGID_CONFIG_ATTR_INVALID_BOOLEAN_VALUE;
- String message = getMessage(msgID, stringValue);
+ String message = getMessage(msgID, getName(), stringValue);
throw new ConfigException(msgID, message);
}
}
else
{
int msgID = MSGID_CONFIG_ATTR_INVALID_BOOLEAN_VALUE;
- String message = getMessage(msgID, value.getClass().getName() + ":" +
- String.valueOf(value));
+ String message = getMessage(msgID, getName(),
+ value.getClass().getName() + ":" +
+ String.valueOf(value));
throw new ConfigException(msgID, message);
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/messages/ConfigMessages.java b/opendj-sdk/opends/src/server/org/opends/server/messages/ConfigMessages.java
index 8b5bc62..1b91fad 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/messages/ConfigMessages.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/messages/ConfigMessages.java
@@ -106,8 +106,8 @@
/**
* The message ID for the message that will be used if an attempt is made to
- * assign an inappropriate value to a boolean attribute. This takes a single
- * argument, which is the provided invalid value.
+ * assign an inappropriate value to a boolean attribute. This takes a two
+ * arguments, which are the attribute name and the provided invalid value.
*/
public static final int MSGID_CONFIG_ATTR_INVALID_BOOLEAN_VALUE =
CATEGORY_MASK_CONFIG | SEVERITY_MASK_MILD_ERROR | 7;
--
Gitblit v1.10.0