From a1f030edc5d19b575470f0d79033d9f7471ab172 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 31 Jan 2014 14:49:58 +0000
Subject: [PATCH] Removed now useless calls to .toString() on arguments of ArgN.get(...).
---
opendj3-server-dev/src/server/org/opends/server/replication/server/DataServerHandler.java | 16 ++++------------
1 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/DataServerHandler.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/DataServerHandler.java
index 39b808d..c34fe50 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/DataServerHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/DataServerHandler.java
@@ -201,9 +201,7 @@
ServerStatus newStatus = StatusMachine.computeNewStatus(status, event);
if (newStatus == ServerStatus.INVALID_STATUS)
{
- LocalizableMessage msg = ERR_RS_CANNOT_CHANGE_STATUS.get(getBaseDNString(),
- Integer.toString(serverId), status.toString(), event.toString());
- logger.error(msg);
+ logger.error(ERR_RS_CANNOT_CHANGE_STATUS.get(getBaseDN(), serverId, status, event));
// Only change allowed is from NORMAL_STATUS to DEGRADED_STATUS and vice
// versa. We may be trying to change the status while another status has
// just been entered: e.g a full update has just been engaged.
@@ -328,14 +326,11 @@
ServerStatus newStatus = StatusMachine.computeNewStatus(status, event);
if (newStatus == ServerStatus.INVALID_STATUS)
{
- LocalizableMessage msg = ERR_RS_CANNOT_CHANGE_STATUS.get(getBaseDNString(),
- Integer.toString(serverId), status.toString(), event.toString());
- logger.error(msg);
+ logger.error(ERR_RS_CANNOT_CHANGE_STATUS.get(getBaseDN(), serverId, status, event));
return ServerStatus.INVALID_STATUS;
}
status = newStatus;
-
return status;
}
@@ -581,11 +576,8 @@
// Sanity check: is it a valid initial status?
if (!isValidInitialStatus(this.status))
{
- LocalizableMessage message = ERR_RS_INVALID_INIT_STATUS.get(
- this.status.toString(),
- getBaseDNString(),
- Integer.toString(serverId));
- throw new DirectoryException(ResultCode.OTHER, message);
+ throw new DirectoryException(ResultCode.OTHER,
+ ERR_RS_INVALID_INIT_STATUS.get( this.status, getBaseDN(), serverId));
}
this.refUrls = startSessionMsg.getReferralsURLs();
--
Gitblit v1.10.0