From 2f01ee4d569022fff64691323b9bbcedc4285d98 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 31 Jan 2014 11:30:32 +0000
Subject: [PATCH] Removed now useless calls to .toString() on arguments of ArgN.get(...).
---
opendj3-server-dev/src/server/org/opends/server/schema/ObjectClassSyntax.java | 44 ++++++++++++++++----------------------------
1 files changed, 16 insertions(+), 28 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/ObjectClassSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/ObjectClassSyntax.java
index 29bbc74..7502d92 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/ObjectClassSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/ObjectClassSyntax.java
@@ -516,11 +516,8 @@
//hyphen is allowed but not as the first byte.
if (index==0)
{
- LocalizableMessage msg = ERR_OC_SYNTAX_ATTR_ILLEGAL_INITIAL_DASH.
- get(value.toString());
- throw new DirectoryException(
- ResultCode.INVALID_ATTRIBUTE_SYNTAX,
- msg);
+ throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
+ ERR_OC_SYNTAX_ATTR_ILLEGAL_INITIAL_DASH.get(value));
}
break;
case '_':
@@ -529,22 +526,16 @@
// name exceptions option is enabled.
if (index==0)
{
- LocalizableMessage msg =
- ERR_OC_SYNTAX_ATTR_ILLEGAL_INITIAL_UNDERSCORE.
- get(value.toString(),
- ATTR_ALLOW_ATTRIBUTE_NAME_EXCEPTIONS);
- throw new DirectoryException(
- ResultCode.INVALID_ATTRIBUTE_SYNTAX,
- msg);
+ LocalizableMessage msg = ERR_OC_SYNTAX_ATTR_ILLEGAL_INITIAL_UNDERSCORE
+ .get(value, ATTR_ALLOW_ATTRIBUTE_NAME_EXCEPTIONS);
+ throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, msg);
}
else if (!allowExceptions)
{
LocalizableMessage msg = ERR_OC_SYNTAX_ATTR_ILLEGAL_UNDERSCORE_CHAR.
- get(value.toString(),
- ATTR_ALLOW_ATTRIBUTE_NAME_EXCEPTIONS);
+ get(value, ATTR_ALLOW_ATTRIBUTE_NAME_EXCEPTIONS);
throw new DirectoryException(
- ResultCode.INVALID_ATTRIBUTE_SYNTAX,
- msg);
+ ResultCode.INVALID_ATTRIBUTE_SYNTAX, msg);
}
break;
@@ -554,11 +545,9 @@
if(index ==0 && isDigit(ch) && !allowExceptions)
{
LocalizableMessage message = ERR_OC_SYNTAX_ATTR_ILLEGAL_INITIAL_DIGIT.
- get(value.toString(), ch,
- ATTR_ALLOW_ATTRIBUTE_NAME_EXCEPTIONS);
+ get(value, ch, ATTR_ALLOW_ATTRIBUTE_NAME_EXCEPTIONS);
throw new DirectoryException(
- ResultCode.INVALID_ATTRIBUTE_SYNTAX,
- message);
+ ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
}
else if(!((ch>='0' && ch<='9') || (ch>='A' && ch<='Z') ||
(ch>='a' && ch<='z')))
@@ -721,7 +710,7 @@
// requires an attribute type that we don't know anything about.
LocalizableMessage message =
WARN_ATTR_SYNTAX_OBJECTCLASS_UNKNOWN_REQUIRED_ATTR.
- get(oid, woidBuffer.toString());
+ get(oid, woidBuffer);
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
message);
}
@@ -766,7 +755,7 @@
// an attribute type that we don't know anything about.
LocalizableMessage message =
WARN_ATTR_SYNTAX_OBJECTCLASS_UNKNOWN_REQUIRED_ATTR.
- get(oid, woidBuffer.toString());
+ get(oid, woidBuffer);
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
message);
}
@@ -807,7 +796,7 @@
// an attribute type that we don't know anything about.
LocalizableMessage message =
WARN_ATTR_SYNTAX_OBJECTCLASS_UNKNOWN_OPTIONAL_ATTR.
- get(oid, woidBuffer.toString());
+ get(oid, woidBuffer);
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
message);
}
@@ -852,7 +841,7 @@
// attribute type that we don't know anything about.
LocalizableMessage message =
WARN_ATTR_SYNTAX_OBJECTCLASS_UNKNOWN_OPTIONAL_ATTR.
- get(oid, woidBuffer.toString());
+ get(oid, woidBuffer);
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
message);
}
@@ -895,8 +884,7 @@
{
LocalizableMessage message =
WARN_ATTR_SYNTAX_OBJECTCLASS_INVALID_SUPERIOR_TYPE.
- get(oid, objectClassType.toString(), superiorType.toString(),
- superiorClass.getNameOrOID());
+ get(oid, objectClassType, superiorType, superiorClass.getNameOrOID());
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
message);
}
@@ -910,7 +898,7 @@
{
LocalizableMessage message =
WARN_ATTR_SYNTAX_OBJECTCLASS_INVALID_SUPERIOR_TYPE.
- get(oid, objectClassType.toString(), superiorType.toString(),
+ get(oid, objectClassType, superiorType,
superiorClass.getNameOrOID());
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
message);
@@ -925,7 +913,7 @@
{
LocalizableMessage message =
WARN_ATTR_SYNTAX_OBJECTCLASS_INVALID_SUPERIOR_TYPE.
- get(oid, objectClassType.toString(), superiorType.toString(),
+ get(oid, objectClassType, superiorType,
superiorClass.getNameOrOID());
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
message);
--
Gitblit v1.10.0