From ec288def6fb618851a002d375384f24fa7a1ce7f Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 15 Oct 2014 14:07:37 +0000
Subject: [PATCH] AbstractSubstringMatchingRuleImpl.java: In DefaultSubstringAssertion.createIndexQuery(), slight improvement.
---
opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractSubstringMatchingRuleImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractSubstringMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractSubstringMatchingRuleImpl.java
index 0ffb344..6152df7 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractSubstringMatchingRuleImpl.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractSubstringMatchingRuleImpl.java
@@ -146,6 +146,11 @@
/** {@inheritDoc} */
@Override
public <T> T createIndexQuery(IndexQueryFactory<T> factory) throws DecodeException {
+ if (normInitial == null && (normAnys == null || normAnys.length == 0) && normFinal == null) {
+ // Can happen with a filter like "cn:en.6:=*", just return an empty record
+ return factory.createMatchAllQuery();
+ }
+
final Collection<T> subqueries = new LinkedList<T>();
if (normInitial != null) {
// relies on the fact that equality indexes are also ordered
@@ -164,11 +169,6 @@
// (possible overlapping with the use of equality index at the start of this method)
substringMatch(factory, normInitial, subqueries);
}
-
- if (normInitial == null && (normAnys == null || normAnys.length == 0) && normFinal == null) {
- // Can happen with a filter like "cn:en.6:=*", just return an empty record
- return factory.createMatchAllQuery();
- }
return factory.createIntersectionQuery(subqueries);
}
--
Gitblit v1.10.0