From 9f8bc22aa6b924a06a284582043dc3e912705f68 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 03 Feb 2014 14:07:31 +0000
Subject: [PATCH] Removed now useless calls to primitive wrapper's toString() on arguments of Logger.*(...) and ArgN.get(...).
---
opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciHandler.java | 2
opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerHandler.java | 6 -
opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerDomain.java | 32 ++++------
opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationBroker.java | 10 +--
opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java | 7 -
opendj3-server-dev/replace.rb | 15 ++++
opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java | 16 ++---
opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationDomain.java | 32 +++-------
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/Installer.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java | 5 -
opendj3-server-dev/src/server/org/opends/server/replication/server/DataServerHandler.java | 10 +--
opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/ParentInheritance.java | 3
opendj3-server-dev/src/server/org/opends/server/replication/server/MsgQueue.java | 4 -
13 files changed, 60 insertions(+), 85 deletions(-)
diff --git a/opendj3-server-dev/replace.rb b/opendj3-server-dev/replace.rb
index 5f2607d..b320709 100755
--- a/opendj3-server-dev/replace.rb
+++ b/opendj3-server-dev/replace.rb
@@ -243,6 +243,19 @@
]
}
+ LOGGER_MSG_ARGN_PRIMITIVE_TOSTRING = {
+ :dirs => JAVA_DIRS,
+ :extensions => ["java"],
+ :replacements =>
+ [
+ /(logger\.\s*(trace|debug|warn|info|error)\s*\([^;]*)\s*(Character|Byte|Boolean|Short|Integer|Long|Float|Double)\s*\.\s*toString\s*\(/m,
+ '\1',
+ # Need to fix removing the last parentheses
+ /([A-Z0-9_]+\s*\.\s*get\s*\([^;]*)\s*(Character|Byte|Boolean|Short|Integer|Long|Float|Double)\s*\.\s*toString\s*\(/m,
+ '\1',
+ ]
+ }
+
LOGGER_ISTRACEENABLED_TRACEEXCEPTION = {
:dirs => JAVA_DIRS,
:extensions => ["java"],
@@ -256,7 +269,7 @@
}
# List of replacements to run
- REPLACEMENTS = [ LOGGER_TOSTRING ]
+ REPLACEMENTS = [ LOGGER_MSG_ARGN_PRIMITIVE_TOSTRING ]
################################### Processing methods ########################################
diff --git a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/Installer.java b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/Installer.java
index 725bc31..8b7bb70 100644
--- a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/Installer.java
+++ b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/Installer.java
@@ -1494,8 +1494,7 @@
{
ae = new ApplicationException(
ReturnCode.IMPORT_ERROR,
- INFO_ERROR_IMPORT_LDIF_TOOL_RETURN_CODE.get(
- Integer.toString(result)), null);
+ INFO_ERROR_IMPORT_LDIF_TOOL_RETURN_CODE.get(result), null);
}
} catch (Throwable t)
{
diff --git a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciHandler.java b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciHandler.java
index bd07642..d322fff 100644
--- a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciHandler.java
@@ -1245,7 +1245,7 @@
if (globalAcis != null)
{
aciList.addAci(DN.rootDN(), globalAcis);
- logger.debug(INFO_ACI_ADD_LIST_GLOBAL_ACIS.get(Integer.toString(globalAcis.size())));
+ logger.debug(INFO_ACI_ADD_LIST_GLOBAL_ACIS.get(globalAcis.size()));
}
}
catch (Exception e)
diff --git a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/ParentInheritance.java b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/ParentInheritance.java
index 79af60c..4604514 100644
--- a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/ParentInheritance.java
+++ b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/ParentInheritance.java
@@ -165,8 +165,7 @@
levels[numLevels++]=Integer.decode(v);
} else {
LocalizableMessage message =
- WARN_ACI_SYNTAX_MAX_USERATTR_INHERITANCE_LEVEL_EXCEEDED.
- get(pattern, Integer.toString(MAX_LEVELS));
+ WARN_ACI_SYNTAX_MAX_USERATTR_INHERITANCE_LEVEL_EXCEEDED.get(pattern, MAX_LEVELS);
throw new AciException(message);
}
} catch (NumberFormatException ex) {
diff --git a/opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java b/opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java
index 4f01891..5193eb2 100644
--- a/opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java
+++ b/opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java
@@ -549,8 +549,7 @@
if(interval == 0) {
DirectoryServer.registerShutdownListener(this);
interval=newInterval;
- msgs.add(INFO_PLUGIN_REFERENT_BACKGROUND_PROCESSING_STARTING.
- get(Long.toString(interval)));
+ msgs.add(INFO_PLUGIN_REFERENT_BACKGROUND_PROCESSING_STARTING.get(interval));
setUpBackGroundProcessing();
} else if(newInterval == 0) {
LocalizableMessage message=
@@ -561,9 +560,7 @@
} else {
interval=newInterval;
backGroundThread.interrupt();
- msgs.add(
- INFO_PLUGIN_REFERENT_BACKGROUND_PROCESSING_UPDATE_INTERVAL_CHANGED.
- get(Long.toString(interval),Long.toString(newInterval)));
+ msgs.add(INFO_PLUGIN_REFERENT_BACKGROUND_PROCESSING_UPDATE_INTERVAL_CHANGED.get(interval, newInterval));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
index d49350d..bcf06a5 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
@@ -1499,11 +1499,11 @@
{
case IMPORT_ERROR_MESSAGE_BAD_REMOTE:
msg = NOTE_ERR_FULL_UPDATE_IMPORT_FRACTIONAL_BAD_REMOTE.get(
- getBaseDNString(), Integer.toString(ieCtx.getImportSource()));
+ getBaseDNString(), ieCtx.getImportSource());
break;
case IMPORT_ERROR_MESSAGE_REMOTE_IS_FRACTIONAL:
msg = NOTE_ERR_FULL_UPDATE_IMPORT_FRACTIONAL_REMOTE_IS_FRACTIONAL.get(
- getBaseDNString(), Integer.toString(ieCtx.getImportSource()));
+ getBaseDNString(), ieCtx.getImportSource());
break;
}
ieCtx.setException(new DirectoryException(UNWILLING_TO_PERFORM, msg));
@@ -1525,7 +1525,7 @@
if (target == RoutableMsg.ALL_SERVERS && fractionalConfig.isFractional())
{
LocalizableMessage msg = NOTE_ERR_FRACTIONAL_FORBIDDEN_FULL_UPDATE_FRACTIONAL.get(
- getBaseDNString(), Integer.toString(getServerId()));
+ getBaseDNString(), getServerId());
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, msg);
}
@@ -2065,8 +2065,7 @@
} catch (TimeoutException ex)
{
// This exception may only be raised if assured replication is enabled
- logger.error(NOTE_DS_ACK_TIMEOUT.get(getBaseDNString(),
- Long.toString(getAssuredTimeout()), msg));
+ logger.error(NOTE_DS_ACK_TIMEOUT.get(getBaseDNString(), getAssuredTimeout(), msg));
}
}
@@ -4522,13 +4521,12 @@
catch (Exception e)
{
LocalizableMessage message = ERR_INVALID_IMPORT_SOURCE.get(
- getBaseDNString(), Integer.toString(getServerId()),
- sourceString, stackTraceToSingleLineString(e));
+ getBaseDNString(), getServerId(), sourceString, stackTraceToSingleLineString(e));
throw new DirectoryException(ResultCode.OTHER, message, e);
}
- LocalizableMessage message = ERR_INVALID_IMPORT_SOURCE.get(getBaseDNString(),
- Integer.toString(getServerId()), Integer.toString(source), "");
+ LocalizableMessage message = ERR_INVALID_IMPORT_SOURCE.get(
+ getBaseDNString(), getServerId(), source, "");
throw new DirectoryException(ResultCode.OTHER, message);
}
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 c34fe50..5945666 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
@@ -103,11 +103,8 @@
{
// Prevent useless error message (full update status cannot lead to bad
// gen status)
- logger.info(NOTE_BAD_GEN_ID_IN_FULL_UPDATE, Integer.toString(replicationServer.getServerId()),
- getBaseDNString(),
- Integer.toString(serverId),
- Long.toString(generationId),
- Long.toString(newGenId));
+ logger.info(NOTE_BAD_GEN_ID_IN_FULL_UPDATE, replicationServer.getServerId(),
+ getBaseDNString(), serverId, generationId, newGenId);
return;
}
@@ -451,8 +448,7 @@
catch(IOException e)
{
LocalizableMessage errMessage = ERR_DS_DISCONNECTED_DURING_HANDSHAKE.get(
- Integer.toString(inServerStartMsg.getServerId()),
- Integer.toString(replicationServer.getServerId()));
+ inServerStartMsg.getServerId(), replicationServer.getServerId());
throw new DirectoryException(ResultCode.OTHER, errMessage);
}
catch (Exception e)
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/MsgQueue.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/MsgQueue.java
index 0df1d80..f71d7da 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/MsgQueue.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/MsgQueue.java
@@ -30,7 +30,6 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.util.TreeMap;
-import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.replication.common.CSN;
import org.opends.server.replication.protocol.UpdateMsg;
@@ -155,8 +154,7 @@
if ((map.size() == 0) && (bytesCount != 0))
{
// should never happen
- LocalizableMessage msg = ERR_BYTE_COUNT.get(Integer.toString(bytesCount));
- logger.error(msg);
+ logger.error(ERR_BYTE_COUNT, bytesCount);
bytesCount = 0;
}
return update;
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerDomain.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
index 8c7b865..5cce1aa 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
@@ -592,7 +592,7 @@
{
// Should never happen
logger.error(ERR_UNKNOWN_ASSURED_SAFE_DATA_LEVEL.get(
- localReplicationServer.getServerId(), Byte.toString(safeDataLevel), baseDN, update));
+ localReplicationServer.getServerId(), safeDataLevel, baseDN, update));
} else if (sourceGroupId == groupId
// Assured feature does not cross different group IDS
&& isSameGenerationId(sourceHandler.getGenerationId()))
@@ -741,9 +741,8 @@
*/
LocalizableMessageBuilder mb = new LocalizableMessageBuilder();
mb.append(ERR_RS_ERROR_SENDING_ACK.get(
- Integer.toString(localReplicationServer.getServerId()),
- Integer.toString(origServer.getServerId()),
- csn, baseDN.toNormalizedString()));
+ localReplicationServer.getServerId(), origServer.getServerId(),
+ csn, baseDN.toNormalizedString()));
mb.append(" ");
mb.append(stackTraceToSingleLineString(e));
logger.error(mb.toMessage());
@@ -819,8 +818,7 @@
*/
LocalizableMessageBuilder mb = new LocalizableMessageBuilder();
mb.append(ERR_RS_ERROR_SENDING_ACK.get(
- Integer.toString(localReplicationServer.getServerId()),
- Integer.toString(origServer.getServerId()),
+ localReplicationServer.getServerId(), origServer.getServerId(),
csn, baseDN.toNormalizedString()));
mb.append(" ");
mb.append(stackTraceToSingleLineString(e));
@@ -1472,8 +1470,7 @@
{
// We log the error. The requestor will detect a timeout or
// any other failure on the connection.
- logger.error(ERR_CHANGELOG_ERROR_SENDING_MSG.get(Integer.toString(msg
- .getDestination())));
+ logger.error(ERR_CHANGELOG_ERROR_SENDING_MSG.get(msg.getDestination()));
}
}
}
@@ -1505,8 +1502,7 @@
RoutableMsg msg)
{
LocalizableMessageBuilder mb = new LocalizableMessageBuilder();
- mb.append(ERR_NO_REACHABLE_PEER_IN_THE_DOMAIN.get(
- baseDN.toNormalizedString(), Integer.toString(msg.getDestination())));
+ mb.append(ERR_NO_REACHABLE_PEER_IN_THE_DOMAIN.get(baseDN.toNormalizedString(), msg.getDestination()));
mb.append(" In Replication Server=").append(
this.localReplicationServer.getMonitorInstanceName());
mb.append(" unroutable message =").append(msg.getClass().getSimpleName());
@@ -1549,8 +1545,7 @@
*/
LocalizableMessageBuilder mb = new LocalizableMessageBuilder();
mb.append(ERR_NO_REACHABLE_PEER_IN_THE_DOMAIN.get(
- baseDN.toNormalizedString(),
- Integer.toString(msg.getDestination())));
+ baseDN.toNormalizedString(), msg.getDestination()));
mb.append(" unroutable message =" + msg.getClass().getSimpleName());
mb.append(" Details: " + ioe.getLocalizedMessage());
final LocalizableMessage message = mb.toMessage();
@@ -1734,7 +1729,7 @@
if (i == 2)
{
logger.error(ERR_EXCEPTION_SENDING_TOPO_INFO, baseDN.toNormalizedString(), "directory",
- Integer.toString(dsHandler.getServerId()), e.getMessage());
+ dsHandler.getServerId(), e.getMessage());
}
}
}
@@ -1768,7 +1763,7 @@
if (i == 2)
{
logger.error(ERR_EXCEPTION_SENDING_TOPO_INFO, baseDN.toNormalizedString(), "replication",
- Integer.toString(rsHandler.getServerId()), e.getMessage());
+ rsHandler.getServerId(), e.getMessage());
}
}
}
@@ -1971,8 +1966,7 @@
} catch (IOException e)
{
logger.error(ERR_EXCEPTION_CHANGING_STATUS_AFTER_RESET_GEN_ID.get(baseDN.toNormalizedString(),
- Integer.toString(dsHandler.getServerId()),
- e.getMessage()));
+ dsHandler.getServerId(), e.getMessage()));
}
}
@@ -2099,10 +2093,8 @@
}
catch (IOException e)
{
- logger.error(ERR_EXCEPTION_CHANGING_STATUS_FROM_STATUS_ANALYZER
- .get(baseDN.toNormalizedString(),
- Integer.toString(dsHandler.getServerId()),
- e.getMessage()));
+ logger.error(ERR_EXCEPTION_CHANGING_STATUS_FROM_STATUS_ANALYZER.get(
+ baseDN.toNormalizedString(), dsHandler.getServerId(), e.getMessage()));
}
if (newStatus == ServerStatus.INVALID_STATUS || newStatus == oldStatus)
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerHandler.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerHandler.java
index b2e0cfe..ea4545c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerHandler.java
@@ -382,10 +382,8 @@
catch (IOException e)
{
logger.traceException(e);
- LocalizableMessage errMessage = ERR_RS_DISCONNECTED_DURING_HANDSHAKE.get(
- Integer.toString(inReplServerStartMsg.getServerId()),
- Integer.toString(replicationServer.getServerId()));
- abortStart(errMessage);
+ abortStart(ERR_RS_DISCONNECTED_DURING_HANDSHAKE.get(
+ inReplServerStartMsg.getServerId(), replicationServer.getServerId()));
}
catch (DirectoryException e)
{
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationBroker.java b/opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationBroker.java
index a33cbb3..38ca65c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationBroker.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationBroker.java
@@ -1012,10 +1012,9 @@
warn user and start heartbeat monitor to recover when a server
with the right group id shows up.
*/
- logger.warn(WARN_CONNECTED_TO_SERVER_WITH_WRONG_GROUP_ID.get(Byte
- .toString(groupId), Integer.toString(rs.getServerId()), rsInfo
- .getServerURL(), Byte.toString(rs.getGroupId()), baseDN
- .toNormalizedString(), Integer.toString(getServerId())));
+ logger.warn(WARN_CONNECTED_TO_SERVER_WITH_WRONG_GROUP_ID.get(
+ groupId, rs.getServerId(), rsInfo.getServerURL(), rs.getGroupId(),
+ baseDN.toNormalizedString(), getServerId()));
}
startRSHeartBeatMonitoring(rs);
if (rsInfo.getProtocolVersion() >=
@@ -2948,8 +2947,7 @@
} catch (IOException ex)
{
logger.error(ERR_EXCEPTION_SENDING_CS, getBaseDN().toNormalizedString(),
- Integer.toString(getServerId()),
- ex.getLocalizedMessage() + " " + stackTraceToSingleLineString(ex));
+ getServerId(), ex.getLocalizedMessage() + " " + stackTraceToSingleLineString(ex));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationDomain.java b/opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationDomain.java
index ce46404..07df960 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationDomain.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationDomain.java
@@ -341,8 +341,7 @@
// Sanity check: is it a valid initial status?
if (!isValidInitialStatus(initStatus))
{
- logger.error(ERR_DS_INVALID_INIT_STATUS.get(initStatus,
- getBaseDNString(), Integer.toString(getServerId())));
+ logger.error(ERR_DS_INVALID_INIT_STATUS.get(initStatus, getBaseDNString(), getServerId()));
}
else
{
@@ -370,8 +369,7 @@
StatusMachineEvent event = StatusMachineEvent.statusToEvent(reqStatus);
if (event == StatusMachineEvent.INVALID_EVENT)
{
- logger.error(ERR_DS_INVALID_REQUESTED_STATUS.get(reqStatus,
- getBaseDNString(), Integer.toString(getServerId())));
+ logger.error(ERR_DS_INVALID_REQUESTED_STATUS.get(reqStatus, getBaseDNString(), getServerId()));
return;
}
@@ -1551,9 +1549,7 @@
if (!ieCtx.failureList.isEmpty() && exportRootException == null)
{
exportRootException = new DirectoryException(ResultCode.OTHER,
- ERR_INIT_NO_SUCCESS_END_FROM_SERVERS.get(
- Long.toString(getGenerationID()),
- ieCtx.failureList));
+ ERR_INIT_NO_SUCCESS_END_FROM_SERVERS.get(getGenerationID(), ieCtx.failureList));
}
// Don't forget to release IEcontext acquired at beginning.
@@ -1910,11 +1906,8 @@
if (msg instanceof TopologyMsg
&& isRemoteDSConnected(ieCtx.importSource) == null)
{
- LocalizableMessage errMsg =
- LocalizableMessage.raw( ERR_INIT_EXPORTER_DISCONNECTION.get(
- getBaseDNString(),
- Integer.toString(getServerId()),
- Integer.toString(ieCtx.importSource)));
+ LocalizableMessage errMsg = ERR_INIT_EXPORTER_DISCONNECTION.get(
+ getBaseDNString(), getServerId(), ieCtx.importSource);
ieCtx.setExceptionIfNoneSet(new DirectoryException(
ResultCode.OTHER, errMsg));
return null;
@@ -2006,8 +1999,7 @@
if (isRemoteDSConnected(slowestServerId)==null)
{
ieCtx.setException(new DirectoryException(ResultCode.OTHER,
- ERR_INIT_HEARTBEAT_LOST_DURING_EXPORT.get(
- Integer.toString(ieCtx.getSlowestServer()))));
+ ERR_INIT_HEARTBEAT_LOST_DURING_EXPORT.get(ieCtx.getSlowestServer())));
throw new IOException("IOException with nested DirectoryException",
ieCtx.getException());
@@ -2035,8 +2027,7 @@
{
// publish failed - store the error in the ieContext ...
DirectoryException de = new DirectoryException(ResultCode.OTHER,
- ERR_INIT_RS_DISCONNECTION_DURING_EXPORT.get(
- Integer.toString(broker.getRsServerId())));
+ ERR_INIT_RS_DISCONNECTION_DURING_EXPORT.get(broker.getRsServerId()));
ieCtx.setExceptionIfNoneSet(de);
// .. and abandon the export by throwing an exception.
throw new IOException(de.getMessage());
@@ -2063,8 +2054,7 @@
{
// publish failed - store the error in the ieContext ...
DirectoryException de = new DirectoryException(ResultCode.OTHER,
- ERR_INIT_RS_DISCONNECTION_DURING_EXPORT.get(
- Integer.toString(broker.getRsServerId())));
+ ERR_INIT_RS_DISCONNECTION_DURING_EXPORT.get(broker.getRsServerId()));
ieCtx.setExceptionIfNoneSet(de);
// .. and abandon the export by throwing an exception.
throw new IOException(de.getMessage());
@@ -2567,8 +2557,7 @@
if (!isConnected())
{
LocalizableMessage message = ERR_RESET_GENERATION_CONN_ERR_ID.get(getBaseDNString(),
- Integer.toString(getServerId()),
- Long.toString(genIdMessage.getGenerationId()));
+ getServerId(), genIdMessage.getGenerationId());
throw new DirectoryException(ResultCode.OTHER, message);
}
broker.publish(genIdMessage);
@@ -3427,8 +3416,7 @@
} catch (TimeoutException ex)
{
// This exception may only be raised if assured replication is enabled
- logger.error(NOTE_DS_ACK_TIMEOUT.get(getBaseDNString(),
- Long.toString(getAssuredTimeout()), update));
+ logger.error(NOTE_DS_ACK_TIMEOUT.get(getBaseDNString(), getAssuredTimeout(), update));
}
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java
index b06fcc0..738be33 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java
@@ -887,8 +887,7 @@
"ds-task-initialize-domain-dn: " + baseDN,
"ds-task-initialize-replica-server-id: -3");
addTask(taskInit, ResultCode.OTHER,
- ERR_INVALID_IMPORT_SOURCE.get(baseDN.toNormalizedString(),
- Integer.toString(server1ID),"-3",""));
+ ERR_INVALID_IMPORT_SOURCE.get(baseDN.toNormalizedString(), server1ID,"-3",""));
// Scope containing a serverID absent from the domain
// createTask(taskInitTargetS2);
@@ -1140,7 +1139,7 @@
"ds-task-initialize-replica-server-id: " + server1ID);
addTask(taskInit, ResultCode.OTHER, ERR_INVALID_IMPORT_SOURCE.get(
- baseDN.toNormalizedString(), Integer.toString(server1ID),"20",""));
+ baseDN.toNormalizedString(), server1ID, "20", ""));
if (replDomain != null)
{
--
Gitblit v1.10.0