From a06fd90c9b6bfb5f9130146373ba18e5769593b6 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Wed, 29 Jan 2014 11:30:37 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1288 : Migrate I18n and logging support to i18n framework and SLF4J
---
opendj3-server-dev/src/server/org/opends/server/replication/server/ServerWriter.java | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/ServerWriter.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/ServerWriter.java
index e700346..6dd4d50 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/ServerWriter.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/ServerWriter.java
@@ -36,7 +36,6 @@
import org.opends.server.replication.protocol.UpdateMsg;
import static org.opends.messages.ReplicationMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.StaticUtils.*;
/**
@@ -126,8 +125,7 @@
{
if (dsStatus == ServerStatus.BAD_GEN_ID_STATUS)
{
- logError(WARN_IGNORING_UPDATE_TO_DS_BADGENID.get(
- handler.getReplicationServerId(),
+ logger.warn(WARN_IGNORING_UPDATE_TO_DS_BADGENID.get(handler.getReplicationServerId(),
update.getCSN().toString(),
handler.getBaseDNString(), handler.getServerId(),
session.getReadableRemoteAddress(),
@@ -136,8 +134,7 @@
}
else if (dsStatus == ServerStatus.FULL_UPDATE_STATUS)
{
- logError(WARN_IGNORING_UPDATE_TO_DS_FULLUP.get(
- handler.getReplicationServerId(),
+ logger.warn(WARN_IGNORING_UPDATE_TO_DS_FULLUP.get(handler.getReplicationServerId(),
update.getCSN().toString(),
handler.getBaseDNString(), handler.getServerId(),
session.getReadableRemoteAddress()));
@@ -155,7 +152,7 @@
|| referenceGenerationId == -1
|| handler.getGenerationId() == -1)
{
- logError(
+ logger.error(
WARN_IGNORING_UPDATE_TO_RS.get(
handler.getReplicationServerId(),
update.getCSN().toString(),
@@ -180,7 +177,7 @@
* be removed, just ignore the exception and let the thread die as well
*/
errMessage = handler.getBadlyDisconnectedErrorMessage();
- logError(errMessage);
+ logger.error(errMessage);
}
catch (Exception e)
{
@@ -190,7 +187,7 @@
*/
errMessage = ERR_WRITER_UNEXPECTED_EXCEPTION.get(handler +
" " + stackTraceToSingleLineString(e));
- logError(errMessage);
+ logger.error(errMessage);
}
finally {
session.close();
--
Gitblit v1.10.0