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/DataServerHandler.java | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/DataServerHandler.java b/opends/src/server/org/opends/server/replication/server/DataServerHandler.java
index 4848f37..9b41e5c 100644
--- a/opends/src/server/org/opends/server/replication/server/DataServerHandler.java
+++ b/opends/src/server/org/opends/server/replication/server/DataServerHandler.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;
@@ -109,7 +109,7 @@
public void changeStatusForResetGenId(long newGenId)
throws IOException
{
- StatusMachineEvent event = null;
+ StatusMachineEvent event;
if (newGenId == -1)
{
@@ -192,7 +192,7 @@
Message message = NOTE_BAD_GEN_ID_IN_FULL_UPDATE.get(
Integer.toString(replicationServerDomain.
getReplicationServer().getServerId()),
- getServiceId().toString(),
+ getServiceId(),
Integer.toString(serverId),
Long.toString(generationId),
Long.toString(newGenId));
@@ -242,7 +242,7 @@
ServerStatus newStatus = StatusMachine.computeNewStatus(status, event);
if (newStatus == ServerStatus.INVALID_STATUS)
{
- Message msg = ERR_RS_CANNOT_CHANGE_STATUS.get(getServiceId().toString(),
+ Message msg = ERR_RS_CANNOT_CHANGE_STATUS.get(getServiceId(),
Integer.toString(serverId), status.toString(), event.toString());
logError(msg);
// Status analyzer must only change from NORMAL_STATUS to DEGRADED_STATUS
@@ -384,7 +384,7 @@
if (event == StatusMachineEvent.INVALID_EVENT)
{
Message msg = ERR_RS_INVALID_NEW_STATUS.get(reqStatus.toString(),
- getServiceId().toString(), Integer.toString(serverId));
+ getServiceId(), Integer.toString(serverId));
logError(msg);
return ServerStatus.INVALID_STATUS;
}
@@ -499,10 +499,9 @@
return;
}
- StartMsg outStartMsg = null;
try
{
- outStartMsg = sendStartToRemote(protocolVersion);
+ StartMsg outStartMsg = sendStartToRemote(protocolVersion);
// log
logStartHandshakeRCVandSND(inServerStartMsg, outStartMsg);
@@ -694,8 +693,7 @@
DataFormatException,
NotSupportedOldVersionPDUException
{
- ReplicationMsg msg = null;
- msg = session.receive();
+ ReplicationMsg msg = session.receive();
if (msg instanceof StopMsg)
{
@@ -719,7 +717,7 @@
{
Message message = ERR_RS_INVALID_INIT_STATUS.get(
this.status.toString(),
- getServiceId().toString(),
+ getServiceId(),
Integer.toString(serverId));
throw new DirectoryException(ResultCode.OTHER, message);
}
--
Gitblit v1.10.0