From 821d2150765f0ab0ac6ccbbc9f397aa65186d590 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Wed, 25 Feb 2015 15:56:57 +0000
Subject: [PATCH] OPENDJ-1585 OPENDJ-1843 CR-5758 Improve code related to DN normalization
---
opendj-server-legacy/src/main/java/org/opends/server/schema/CollationMatchingRuleFactory.java | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/CollationMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/CollationMatchingRuleFactory.java
index e0ff470..cea2ffe 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/CollationMatchingRuleFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/CollationMatchingRuleFactory.java
@@ -272,9 +272,7 @@
if (nOID == null || languageTag == null)
{
configAcceptable = false;
- LocalizableMessage msg =
- WARN_ATTR_INVALID_COLLATION_MATCHING_RULE_FORMAT
- .get(collation);
+ LocalizableMessage msg = WARN_ATTR_INVALID_COLLATION_MATCHING_RULE_FORMAT.get(collation);
unacceptableReasons.add(msg);
continue;
}
@@ -282,10 +280,8 @@
Locale locale = getLocale(languageTag);
if (locale == null)
{
- LocalizableMessage msg =
- WARN_ATTR_INVALID_COLLATION_MATCHING_RULE_LOCALE.get(
- collation, configuration.dn().toString(),
- languageTag);
+ LocalizableMessage msg = WARN_ATTR_INVALID_COLLATION_MATCHING_RULE_LOCALE.get(
+ collation, configuration.dn(), languageTag);
unacceptableReasons.add(msg);
configAcceptable = false;
continue;
--
Gitblit v1.10.0