From ea9338f20259f92ccb818876e27cd83908cef0d0 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Wed, 04 Dec 2013 16:23:38 +0000
Subject: [PATCH] Backport fix for OPENDJ-1200: Upgrade tool loses one ds-cfg-character-set value
---
opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRule.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRule.java b/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRule.java
index 8511741..7f315f6 100644
--- a/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRule.java
+++ b/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRule.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2009-2010 Sun Microsystems, Inc.
+ * Portions copyright 2013 ForgeRock AS.
*/
package org.forgerock.opendj.ldap.schema;
@@ -370,10 +371,10 @@
}
if (impl == null) {
- impl = Schema.getDefaultMatchingRule().impl;
- final LocalizableMessage message =
- WARN_MATCHING_RULE_NOT_IMPLEMENTED1.get(getNameOrOID(), Schema
- .getDefaultMatchingRule().getOID());
+ impl = schema.getDefaultMatchingRule().impl;
+ final LocalizableMessage message = WARN_MATCHING_RULE_NOT_IMPLEMENTED1
+ .get(getNameOrOID(), schema.getDefaultMatchingRule()
+ .getOID());
warnings.add(message);
}
--
Gitblit v1.10.0