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/ReplicationServerDomain.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java b/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
index e4ddeb3..6a36e49 100644
--- a/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
+++ b/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.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;
@@ -291,7 +291,7 @@
// look for the dbHandler that is responsible for the LDAP server which
// generated the change.
- DbHandler dbHandler = null;
+ DbHandler dbHandler;
synchronized (sourceDbHandlers)
{
dbHandler = sourceDbHandlers.get(id);
@@ -1936,7 +1936,7 @@
if (i==2)
{
Message message = ERR_EXCEPTION_SENDING_TOPO_INFO.get(
- baseDn.toString(),
+ baseDn,
"directory",
Integer.toString(handler.getServerId()),
e.getMessage());
@@ -1976,7 +1976,7 @@
if (i==2)
{
Message message = ERR_EXCEPTION_SENDING_TOPO_INFO.get(
- baseDn.toString(),
+ baseDn,
"replication",
Integer.toString(handler.getServerId()),
e.getMessage());
@@ -2186,7 +2186,7 @@
}
} catch (IOException e)
{
- logError(ERR_EXCEPTION_FORWARDING_RESET_GEN_ID.get(baseDn.toString(),
+ logError(ERR_EXCEPTION_FORWARDING_RESET_GEN_ID.get(baseDn,
e.getMessage()));
}
}
@@ -2200,8 +2200,7 @@
dsHandler.changeStatusForResetGenId(newGenId);
} catch (IOException e)
{
- logError(ERR_EXCEPTION_CHANGING_STATUS_AFTER_RESET_GEN_ID.get(baseDn.
- toString(),
+ logError(ERR_EXCEPTION_CHANGING_STATUS_AFTER_RESET_GEN_ID.get(baseDn,
Integer.toString(dsHandler.getServerId()),
e.getMessage()));
}
@@ -2343,7 +2342,7 @@
catch (IOException e)
{
logError(ERR_EXCEPTION_CHANGING_STATUS_FROM_STATUS_ANALYZER
- .get(baseDn.toString(),
+ .get(baseDn,
Integer.toString(serverHandler.getServerId()),
e.getMessage()));
}
@@ -3095,7 +3094,7 @@
// Publish to monitor the generation ID by replicationServerDomain
builder = new AttributeBuilder("generation-id");
- builder.add(baseDn.toString() + " " + generationId);
+ builder.add(baseDn + " " + generationId);
attributes.add(builder.toAttribute());
MonitorData md = getDomainMonitorData();
--
Gitblit v1.10.0