From 96cec6349e08df6630bae1932cca8d831d0fb123 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Thu, 09 Apr 2015 22:45:43 +0000
Subject: [PATCH] Minor code cleanup:
---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java | 34 +---------------------------------
1 files changed, 1 insertions(+), 33 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java
index 7683e61..c00bd21 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java
@@ -45,7 +45,6 @@
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.util.Reject;
import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.meta.BackendIndexCfgDefn;
import org.opends.server.admin.std.server.PluggableBackendCfg;
import org.opends.server.api.Backend;
import org.opends.server.api.MonitorProvider;
@@ -251,42 +250,11 @@
{
EntryContainer ec = rootContainer.getEntryContainer(baseDNs[0]);
AttributeIndex ai = ec.getAttributeIndex(attributeType);
- if (ai == null)
- {
- return false;
- }
-
- Set<BackendIndexCfgDefn.IndexType> indexTypes =
- ai.getConfiguration().getIndexType();
- switch (indexType)
- {
- case PRESENCE:
- return indexTypes.contains(BackendIndexCfgDefn.IndexType.PRESENCE);
-
- case EQUALITY:
- return indexTypes.contains(BackendIndexCfgDefn.IndexType.EQUALITY);
-
- case SUBSTRING:
- case SUBINITIAL:
- case SUBANY:
- case SUBFINAL:
- return indexTypes.contains(BackendIndexCfgDefn.IndexType.SUBSTRING);
-
- case GREATER_OR_EQUAL:
- case LESS_OR_EQUAL:
- return indexTypes.contains(BackendIndexCfgDefn.IndexType.ORDERING);
-
- case APPROXIMATE:
- return indexTypes.contains(BackendIndexCfgDefn.IndexType.APPROXIMATE);
-
- default:
- return false;
- }
+ return ai != null ? ai.isIndexed(indexType) : false;
}
catch (Exception e)
{
logger.traceException(e);
-
return false;
}
}
--
Gitblit v1.10.0