From d8475ffa48cc7a7ecdca78295bf2ce42c6042e48 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Fri, 17 Jun 2011 15:55:07 +0000
Subject: [PATCH] Initial work for OPENDJ-155: Add support for OpenDJ extended matching rules and syntaxes
---
opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClassSyntaxImpl.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClassSyntaxImpl.java b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClassSyntaxImpl.java
index 2121648..81c8605 100644
--- a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClassSyntaxImpl.java
+++ b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClassSyntaxImpl.java
@@ -78,9 +78,9 @@
{
// We'll use the decodeObjectClass method to determine if the value
// is acceptable.
+ final String definition = value.toString();
try
{
- final String definition = value.toString();
final SubstringReader reader = new SubstringReader(definition);
// We'll do this a character at a time. First, skip over any
@@ -91,8 +91,8 @@
{
// This means that the value was empty or contained only
// whitespace. That is illegal.
- final LocalizableMessage message = ERR_ATTR_SYNTAX_OBJECTCLASS_EMPTY_VALUE
- .get();
+ final LocalizableMessage message = ERR_ATTR_SYNTAX_OBJECTCLASS_EMPTY_VALUE1
+ .get(definition);
final DecodeException e = DecodeException.error(message);
StaticUtils.DEBUG_LOG.throwing("ObjectClassSyntax",
"valueIsAcceptable", e);
@@ -104,7 +104,7 @@
final char c = reader.read();
if (c != '(')
{
- final LocalizableMessage message = ERR_ATTR_SYNTAX_OBJECTCLASS_EXPECTED_OPEN_PARENTHESIS
+ final LocalizableMessage message = ERR_ATTR_SYNTAX_OBJECTCLASS_EXPECTED_OPEN_PARENTHESIS1
.get(definition, (reader.pos() - 1), String.valueOf(c));
final DecodeException e = DecodeException.error(message);
StaticUtils.DEBUG_LOG.throwing("ObjectClassSyntax",
@@ -198,8 +198,8 @@
}
else
{
- final LocalizableMessage message = ERR_ATTR_SYNTAX_ILLEGAL_TOKEN
- .get(tokenName);
+ final LocalizableMessage message = ERR_ATTR_SYNTAX_OBJECTCLASS_ILLEGAL_TOKEN1
+ .get(definition, tokenName);
final DecodeException e = DecodeException.error(message);
StaticUtils.DEBUG_LOG.throwing("ObjectClassSyntax",
"valueIsAcceptable", e);
@@ -210,7 +210,8 @@
}
catch (final DecodeException de)
{
- invalidReason.append(de.getMessageObject());
+ invalidReason.append(ERR_ATTR_SYNTAX_OBJECTCLASS_INVALID1.get(definition,
+ de.getMessageObject()));
return false;
}
}
--
Gitblit v1.10.0