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/ServerReader.java | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/ServerReader.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/ServerReader.java
index b2ac9a8..80523b2 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/ServerReader.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/ServerReader.java
@@ -35,7 +35,6 @@
import org.opends.server.replication.protocol.*;
import static org.opends.messages.ReplicationMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.replication.common.ServerStatus.*;
import static org.opends.server.util.StaticUtils.*;
@@ -130,16 +129,14 @@
{
long referenceGenerationId = handler.getReferenceGenId();
if (dsStatus == BAD_GEN_ID_STATUS)
- logError(WARN_IGNORING_UPDATE_FROM_DS_BADGENID.get(
- handler.getReplicationServerId(),
+ logger.warn(WARN_IGNORING_UPDATE_FROM_DS_BADGENID.get(handler.getReplicationServerId(),
updateMsg.getCSN().toString(),
handler.getBaseDNString(), handler.getServerId(),
session.getReadableRemoteAddress(),
handler.getGenerationId(),
referenceGenerationId));
if (dsStatus == FULL_UPDATE_STATUS)
- logError(WARN_IGNORING_UPDATE_FROM_DS_FULLUP.get(
- handler.getReplicationServerId(),
+ logger.warn(WARN_IGNORING_UPDATE_FROM_DS_FULLUP.get(handler.getReplicationServerId(),
updateMsg.getCSN().toString(),
handler.getBaseDNString(), handler.getServerId(),
session.getReadableRemoteAddress()));
@@ -155,7 +152,7 @@
if (referenceGenerationId > 0
&& referenceGenerationId != handler.getGenerationId())
{
- logError(
+ logger.error(
WARN_IGNORING_UPDATE_FROM_RS.get(
handler.getReplicationServerId(),
updateMsg.getCSN().toString(),
@@ -203,7 +200,7 @@
handler.getBaseDNString(),
Integer.toString(handler.getServerId()),
csMsg.toString());
- logError(errMessage);
+ logger.error(errMessage);
}
} else if (msg instanceof ChangeTimeHeartbeatMsg)
{
@@ -226,7 +223,7 @@
* connection.
*/
errMessage = NOTE_READER_NULL_MSG.get(handler.toString());
- logError(errMessage);
+ logger.error(errMessage);
return;
}
} catch (NotSupportedOldVersionPDUException e)
@@ -249,7 +246,7 @@
if (!handler.shuttingDown())
{
errMessage = handler.getBadlyDisconnectedErrorMessage();
- logError(errMessage);
+ logger.error(errMessage);
}
}
catch (Exception e)
@@ -260,7 +257,7 @@
*/
errMessage = NOTE_READER_EXCEPTION.get(
handler.toString(), stackTraceToSingleLineString(e));
- logError(errMessage);
+ logger.error(errMessage);
}
finally
{
--
Gitblit v1.10.0