From 15a0d1142e68d860e17f0b3dd130d5c44d4dd9f2 Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Sat, 22 Sep 2012 12:21:06 +0000
Subject: [PATCH] Code cleanup after running Findbugs. Remove useless initializations, useless toString() on strings, and other redundant if tests...
---
opends/src/server/org/opends/server/replication/server/ReplicationDB.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/ReplicationDB.java b/opends/src/server/org/opends/server/replication/server/ReplicationDB.java
index 9487ede..fe5b442 100644
--- a/opends/src/server/org/opends/server/replication/server/ReplicationDB.java
+++ b/opends/src/server/org/opends/server/replication/server/ReplicationDB.java
@@ -23,7 +23,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011 ForgeRock AS
+ * Portions Copyright 2011-2012 ForgeRock AS
*/
package org.opends.server.replication.server;
import org.opends.messages.MessageBuilder;
@@ -125,7 +125,7 @@
dbCloseLock = new ReentrantReadWriteLock(true);
//
- Cursor cursor = null;
+ Cursor cursor;
Transaction txn = null;
DatabaseEntry key = new DatabaseEntry();
DatabaseEntry data = new DatabaseEntry();
@@ -315,7 +315,6 @@
public ChangeNumber readFirstChange()
{
Cursor cursor = null;
- String str = null;
ChangeNumber cn = null;
try
@@ -343,7 +342,7 @@
return null;
}
- str = decodeUTF8(key.getData());
+ String str = decodeUTF8(key.getData());
cn = new ChangeNumber(str);
if (ReplicationDB.isaCounter(cn))
{
@@ -557,7 +556,7 @@
@Override
public String toString()
{
- return serverId + baseDn.toString();
+ return serverId + baseDn;
}
/**
@@ -633,9 +632,9 @@
{
// We can move close to the startingChangeNumber.
// Let's create a cursor from that point.
- DatabaseEntry key = new DatabaseEntry();
- DatabaseEntry data = new DatabaseEntry();
- if (localCursor.getPrev(key, data, LockMode.DEFAULT) !=
+ DatabaseEntry aKey = new DatabaseEntry();
+ DatabaseEntry aData = new DatabaseEntry();
+ if (localCursor.getPrev(aKey, aData, LockMode.DEFAULT) !=
OperationStatus.SUCCESS)
{
localCursor.close();
--
Gitblit v1.10.0