From 455c5fbb1015c63ef8ef3be1750274c2b5773a63 Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Thu, 20 Jan 2011 18:07:33 +0000
Subject: [PATCH] Code cleanup removing potential issues detected by FindBugs
---
opends/src/server/org/opends/server/backends/jeb/AttributeIndex.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/opends/src/server/org/opends/server/backends/jeb/AttributeIndex.java b/opends/src/server/org/opends/server/backends/jeb/AttributeIndex.java
index 967ff0b..be3911a 100644
--- a/opends/src/server/org/opends/server/backends/jeb/AttributeIndex.java
+++ b/opends/src/server/org/opends/server/backends/jeb/AttributeIndex.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.server.backends.jeb;
import org.opends.messages.Message;
@@ -257,7 +258,7 @@
{
Set<String> extensibleRules =
indexConfig.getIndexExtensibleMatchingRule();
- if(extensibleRules == null || extensibleRules.size() == 0)
+ if(extensibleRules == null || extensibleRules.isEmpty())
{
Message message = ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(
String.valueOf(attrType), "extensible");
@@ -1816,7 +1817,7 @@
{
Set<String> newRules =
cfg.getIndexExtensibleMatchingRule();
- if (newRules == null || newRules.size() == 0)
+ if (newRules == null || newRules.isEmpty())
{
Message message = ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(
String.valueOf(attrType), "extensible");
@@ -2952,7 +2953,7 @@
{
Set<ExtensibleMatchingRule> rules = id2RulesMap.get(indexID);
rules.remove(rule);
- if(rules.size() == 0)
+ if(rules.isEmpty())
{
id2RulesMap.remove(indexID);
}
@@ -2991,7 +2992,10 @@
private void deleteRule(String indexID)
{
Set<ExtensibleMatchingRule> rules = id2RulesMap.get(indexID);
- rule2FactoryMap.remove(rules);
+ for (ExtensibleMatchingRule rule : rules)
+ {
+ rule2FactoryMap.remove(rule);
+ }
rules.clear();
id2RulesMap.remove(indexID);
}
--
Gitblit v1.10.0