From ba663b53d933130d2b6a68c1644e5744428dd1d6 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 25 Nov 2016 11:41:50 +0000
Subject: [PATCH] Manual fixes/changes post inlining DirectoryServer.getSchema()
---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/AttributeIndex.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/AttributeIndex.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/AttributeIndex.java
index f38c236..a63026c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/AttributeIndex.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/AttributeIndex.java
@@ -411,7 +411,7 @@
{
try
{
- final MatchingRule rule = DirectoryServer.getInstance().getServerContext().getSchema().getMatchingRule(ruleName);
+ final MatchingRule rule = getSchema().getMatchingRule(ruleName);
for (Indexer indexer : rule.createIndexers(options))
{
indexers.put(indexer, false);
@@ -1098,7 +1098,7 @@
return evaluateFilter(indexQueryFactory, IndexFilterType.EQUALITY, filter, debugBuffer, monitor);
}
- MatchingRule rule = DirectoryServer.getInstance().getServerContext().getSchema().getMatchingRule(matchRuleOID);
+ MatchingRule rule = getSchema().getMatchingRule(matchRuleOID);
if (!ruleHasAtLeastOneIndex(rule))
{
if (monitor.isFilterUseEnabled())
@@ -1133,6 +1133,11 @@
}
}
+ private static Schema getSchema()
+ {
+ return DirectoryServer.getInstance().getServerContext().getSchema();
+ }
+
private boolean ruleHasAtLeastOneIndex(MatchingRule rule)
{
for (Indexer indexer : rule.createIndexers(indexingOptions))
--
Gitblit v1.10.0