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/VLVIndex.java | 19 +++++++++++--------
opends/src/server/org/opends/server/backends/jeb/EntryIDSetSorter.java | 22 ++++++++++------------
opends/src/server/org/opends/server/backends/jeb/AttributeIndex.java | 12 ++++++++----
3 files changed, 29 insertions(+), 24 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);
}
diff --git a/opends/src/server/org/opends/server/backends/jeb/EntryIDSetSorter.java b/opends/src/server/org/opends/server/backends/jeb/EntryIDSetSorter.java
index d2d9f51..a13bd6c 100644
--- a/opends/src/server/org/opends/server/backends/jeb/EntryIDSetSorter.java
+++ b/opends/src/server/org/opends/server/backends/jeb/EntryIDSetSorter.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.server.backends.jeb;
import org.opends.messages.Message;
@@ -240,19 +241,16 @@
}
else if (beforeCount > 0)
{
- if (beforeCount > 0)
+ idList.add(id);
+ includedBeforeCount++;
+ if (includedBeforeCount > beforeCount)
{
- idList.add(id);
- includedBeforeCount++;
- if (includedBeforeCount > beforeCount)
- {
- idList.removeFirst();
- includedBeforeCount--;
- }
- else
- {
- listSize++;
- }
+ idList.removeFirst();
+ includedBeforeCount--;
+ }
+ else
+ {
+ listSize++;
}
}
}
diff --git a/opends/src/server/org/opends/server/backends/jeb/VLVIndex.java b/opends/src/server/org/opends/server/backends/jeb/VLVIndex.java
index 62117ff..444b129 100644
--- a/opends/src/server/org/opends/server/backends/jeb/VLVIndex.java
+++ b/opends/src/server/org/opends/server/backends/jeb/VLVIndex.java
@@ -23,14 +23,13 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.server.backends.jeb;
import org.opends.messages.Message;
import com.sleepycat.je.*;
import org.opends.server.loggers.debug.DebugTracer;
-import static org.opends.server.loggers.debug.DebugLogger.getTracer;
-import static org.opends.server.loggers.ErrorLogger.*;
import org.opends.server.types.*;
import org.opends.server.admin.std.server.LocalDBVLVIndexCfg;
import org.opends.server.admin.server.ConfigurationChangeListener;
@@ -63,7 +62,7 @@
* This class represents a VLV index. Each database record is a sorted list
* of entry IDs followed by sets of attribute values used to sort the entries.
* The entire set of entry IDs are broken up into sorted subsets to decrease
- * the number of database retrivals needed for a range lookup. The records are
+ * the number of database retrievals needed for a range lookup. The records are
* keyed by the last entry's first sort attribute value. The list of entries
* in a particular database record maintains the property where the first sort
* attribute value is bigger then the previous key but smaller or equal
@@ -246,6 +245,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void open() throws DatabaseException
{
super.open();
@@ -278,6 +278,7 @@
* @throws DatabaseException if a JE database error occurs while
* closing the index.
*/
+ @Override
public void close() throws DatabaseException
{
super.close();
@@ -906,8 +907,8 @@
{
// Handle cases where nothing is changed early to avoid
// DB access.
- if((addedValues == null || addedValues.size() == 0) &&
- (deletedValues == null || deletedValues.size() == 0))
+ if((addedValues == null || addedValues.isEmpty()) &&
+ (deletedValues == null || deletedValues.isEmpty()))
{
return;
}
@@ -1870,9 +1871,11 @@
resultCode = ResultCode.INVALID_ATTRIBUTE_SYNTAX;
}
}
- // BUG: attrType may be NULL
- sortKeys[i] = new SortKey(attrType, ascending[i]);
- orderingRules[i] = attrType.getOrderingMatchingRule();
+ else
+ {
+ sortKeys[i] = new SortKey(attrType, ascending[i]);
+ orderingRules[i] = attrType.getOrderingMatchingRule();
+ }
}
this.sortOrder = new SortOrder(sortKeys);
--
Gitblit v1.10.0