From 6b5f26722aa60b3f428a930e9d7eebce8f514c9d Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 25 Aug 2015 13:00:27 +0000
Subject: [PATCH] Use Collection.contains()
---
opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryContainer.java | 19 +++++--------------
1 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryContainer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryContainer.java
index 215c9e3..ee182b5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryContainer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryContainer.java
@@ -3265,30 +3265,21 @@
private boolean isAttributeModified(AttributeIndex index,
List<Modification> mods)
{
- boolean attributeModified = false;
AttributeType indexAttributeType = index.getAttributeType();
- Iterable<AttributeType> subTypes =
+ List<AttributeType> subTypes =
DirectoryServer.getSchema().getSubTypes(indexAttributeType);
for (Modification mod : mods)
{
Attribute modAttr = mod.getAttribute();
AttributeType modAttrType = modAttr.getAttributeType();
- if (modAttrType.equals(indexAttributeType))
+ if (modAttrType.equals(indexAttributeType)
+ || subTypes.contains(modAttrType))
{
- attributeModified = true;
- break;
- }
- for(AttributeType subType : subTypes)
- {
- if(modAttrType.equals(subType))
- {
- attributeModified = true;
- break;
- }
+ return true;
}
}
- return attributeModified;
+ return false;
}
--
Gitblit v1.10.0