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/MatchingRule.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRule.java b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRule.java
index d7e875c..fcd4ae8 100644
--- a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRule.java
+++ b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRule.java
@@ -29,8 +29,7 @@
-import static org.forgerock.opendj.ldap.CoreMessages.ERR_ATTR_SYNTAX_MR_UNKNOWN_SYNTAX;
-import static org.forgerock.opendj.ldap.CoreMessages.WARN_MATCHING_RULE_NOT_IMPLEMENTED;
+import static org.forgerock.opendj.ldap.CoreMessages.*;
import java.util.Comparator;
import java.util.Iterator;
@@ -457,19 +456,19 @@
if (impl == null)
{
impl = Schema.getDefaultMatchingRule().impl;
- final LocalizableMessage message = WARN_MATCHING_RULE_NOT_IMPLEMENTED
- .get(oid, Schema.getDefaultMatchingRule().getOID());
+ final LocalizableMessage message = WARN_MATCHING_RULE_NOT_IMPLEMENTED1
+ .get(getNameOrOID(), Schema.getDefaultMatchingRule().getOID());
warnings.add(message);
}
try
{
- // Make sure the specifiec syntax is defined in this schema.
+ // Make sure the specific syntax is defined in this schema.
syntax = schema.getSyntax(syntaxOID);
}
catch (final UnknownSchemaElementException e)
{
- final LocalizableMessage message = ERR_ATTR_SYNTAX_MR_UNKNOWN_SYNTAX.get(
+ final LocalizableMessage message = ERR_ATTR_SYNTAX_MR_UNKNOWN_SYNTAX1.get(
getNameOrOID(), syntaxOID);
throw new SchemaException(message, e);
}
--
Gitblit v1.10.0