From 4cd06b3633e335f68d6cad0ad2483246076775b4 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 07 Apr 2015 15:43:34 +0000
Subject: [PATCH] Code simplification in AttributeIndex
---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Suffix.java | 18 +++---------------
1 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Suffix.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Suffix.java
index 9f94194..af06d45 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Suffix.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Suffix.java
@@ -263,11 +263,7 @@
entryContainer.getID2Subtree().setTrusted(txn, trusted);
for (AttributeIndex attributeIndex : entryContainer.getAttributeIndexes())
{
- setTrusted(txn, attributeIndex.getEqualityIndex(), trusted);
- setTrusted(txn, attributeIndex.getPresenceIndex(), trusted);
- setTrusted(txn, attributeIndex.getSubstringIndex(), trusted);
- setTrusted(txn, attributeIndex.getOrderingIndex(), trusted);
- setTrusted(txn, attributeIndex.getApproximateIndex(), trusted);
+ setTrusted(txn, attributeIndex.getDefaultNameToIndexes().values(), trusted);
Map<String, Collection<MatchingRuleIndex>> exIndexes = attributeIndex.getExtensibleIndexes();
if(!exIndexes.isEmpty())
{
@@ -280,21 +276,13 @@
}
}
- private void setTrusted(WriteableTransaction txn, Index index, boolean trusted)
- {
- if (index != null)
- {
- index.setTrusted(txn, trusted);
- }
- }
-
private void setTrusted(WriteableTransaction txn, Collection<MatchingRuleIndex> indexes, boolean trusted)
{
if (indexes != null)
{
- for (Index subIndex : indexes)
+ for (Index index : indexes)
{
- subIndex.setTrusted(txn, trusted);
+ index.setTrusted(txn, trusted);
}
}
}
--
Gitblit v1.10.0