From edc595e56216e680d268376e85c7625f2f052b6a Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 09 Jul 2015 08:40:36 +0000
Subject: [PATCH] AutoRefactor'ed Collections
---
opendj-server-legacy/src/main/java/org/opends/server/plugins/AttributeCleanupPlugin.java | 18 ++++--------------
1 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/AttributeCleanupPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/AttributeCleanupPlugin.java
index 14b85a0..466b43c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/AttributeCleanupPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/AttributeCleanupPlugin.java
@@ -312,30 +312,20 @@
isValid = false;
}
- /*
- * Check for duplicates.
- */
+ // Check for duplicates.
final String nfromAttr = toLowerCase(fromAttr);
- if (fromAttrs.contains(nfromAttr))
+ if (!fromAttrs.add(nfromAttr))
{
messages.add(ERR_PLUGIN_ATTR_CLEANUP_DUPLICATE_VALUE.get(fromAttr));
isValid = false;
}
- else
- {
- fromAttrs.add(nfromAttr);
- }
- /*
- * Check that attribute does not map to itself.
- */
+ // Check that attribute does not map to itself.
if (nfromAttr.equals(toLowerCase(toAttr)))
{
- messages
- .add(ERR_PLUGIN_ATTR_CLEANUP_EQUAL_VALUES.get(fromAttr, toAttr));
+ messages.add(ERR_PLUGIN_ATTR_CLEANUP_EQUAL_VALUES.get(fromAttr, toAttr));
isValid = false;
}
-
}
return isValid;
--
Gitblit v1.10.0