From a1f030edc5d19b575470f0d79033d9f7471ab172 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 31 Jan 2014 14:49:58 +0000
Subject: [PATCH] Removed now useless calls to .toString() on arguments of ArgN.get(...).
---
opendj3-server-dev/src/server/org/opends/server/schema/UUIDEqualityMatchingRule.java | 62 ++++++++++--------------------
1 files changed, 21 insertions(+), 41 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/UUIDEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/UUIDEqualityMatchingRule.java
index 827555b..b30fb85 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/UUIDEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/UUIDEqualityMatchingRule.java
@@ -149,19 +149,8 @@
{
if (value.length() != 36)
{
- LocalizableMessage message = WARN_ATTR_SYNTAX_UUID_INVALID_LENGTH.get(
- value.toString(), value.length());
- switch (DirectoryServer.getSyntaxEnforcementPolicy())
- {
- case REJECT:
- throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
- message);
- case WARN:
- logger.error(message);
- return value.toByteString();
- default:
- return value.toByteString();
- }
+ return reportInvalidAttrSyntax(value,
+ WARN_ATTR_SYNTAX_UUID_INVALID_LENGTH.get(value, value.length()));
}
StringBuilder builder = new StringBuilder(36);
@@ -179,20 +168,8 @@
case 23:
if (c != '-')
{
- LocalizableMessage message = WARN_ATTR_SYNTAX_UUID_EXPECTED_DASH.get(
- value.toString(), i, String.valueOf(c));
- switch (DirectoryServer.getSyntaxEnforcementPolicy())
- {
- case REJECT:
- throw new DirectoryException(
- ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
- case WARN:
- logger.error(
- message);
- return value.toByteString();
- default:
- return value.toByteString();
- }
+ return reportInvalidAttrSyntax(value,
+ WARN_ATTR_SYNTAX_UUID_EXPECTED_DASH.get(value, i, c));
}
builder.append(c);
break;
@@ -237,25 +214,28 @@
builder.append('f');
break;
default:
- LocalizableMessage message = WARN_ATTR_SYNTAX_UUID_EXPECTED_HEX.get(
- value.toString(), i, String.valueOf(value.byteAt(i)));
- switch (DirectoryServer.getSyntaxEnforcementPolicy())
- {
- case REJECT:
- throw new DirectoryException(
- ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
- case WARN:
- logger.error(
- message);
- return value.toByteString();
- default:
- return value.toByteString();
- }
+ return reportInvalidAttrSyntax(value,
+ WARN_ATTR_SYNTAX_UUID_EXPECTED_HEX.get(value, i, value.byteAt(i)));
}
}
}
return ByteString.valueOf(builder.toString());
}
+
+ private ByteString reportInvalidAttrSyntax(ByteSequence value, LocalizableMessage message)
+ throws DirectoryException
+ {
+ switch (DirectoryServer.getSyntaxEnforcementPolicy())
+ {
+ case REJECT:
+ throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
+ case WARN:
+ logger.error(message);
+ return value.toByteString();
+ default:
+ return value.toByteString();
+ }
+ }
}
--
Gitblit v1.10.0