From aed1c25445b53aee1043dfad76f95a025986783f Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 02 Jun 2016 12:19:11 +0000
Subject: [PATCH] OPENDJ-3037 remove now unnecessary calls to toLowerCase() for parameters of Schema.getMatchingRule()
---
opendj-server-legacy/src/main/java/org/opends/server/api/Backend.java | 17 +++++------------
1 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/Backend.java b/opendj-server-legacy/src/main/java/org/opends/server/api/Backend.java
index 3be0f5f..371464d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/Backend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/Backend.java
@@ -28,12 +28,13 @@
import java.util.concurrent.ConcurrentLinkedQueue;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.opendj.config.Configuration;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ConditionResult;
+import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.forgerock.opendj.ldap.schema.MatchingRule;
-import org.forgerock.opendj.config.Configuration;
import org.opends.server.backends.RebuildConfig;
import org.opends.server.backends.VerifyConfig;
import org.opends.server.core.AddOperation;
@@ -49,7 +50,6 @@
import org.opends.server.types.BackupConfig;
import org.opends.server.types.BackupDirectory;
import org.opends.server.types.CanceledOperationException;
-import org.forgerock.opendj.ldap.DN;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.Entry;
import org.opends.server.types.IndexType;
@@ -321,17 +321,10 @@
return false;
}
- MatchingRule matchingRule;
String matchingRuleID = filter.getMatchingRuleID();
- if (matchingRuleID != null)
- {
- matchingRule = DirectoryServer.getMatchingRule(
- matchingRuleID.toLowerCase());
- }
- else
- {
- matchingRule = attrType.getEqualityMatchingRule();
- }
+ MatchingRule matchingRule = matchingRuleID != null
+ ? DirectoryServer.getMatchingRule(matchingRuleID)
+ : attrType.getEqualityMatchingRule();
// FIXME isIndexed() always return false down below
return matchingRule != null && isIndexed(attrType, matchingRule);
--
Gitblit v1.10.0