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/ReplicationServerHandler.java | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
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 de7e5bc..f993bec 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
@@ -27,6 +27,7 @@
package org.opends.server.replication.server;
import java.io.IOException;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -40,7 +41,6 @@
import org.opends.server.replication.protocol.*;
import org.opends.server.types.*;
import static org.opends.messages.ReplicationMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.replication.protocol.ProtocolVersion.*;
/**
@@ -50,6 +50,9 @@
public class ReplicationServerHandler extends ServerHandler
{
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
+
/**
* Properties filled only if remote server is a RS.
*/
@@ -246,11 +249,9 @@
replicationServerDomain.receiveTopoInfoFromRS(inTopoMsg, this, false);
}
- LocalizableMessage message = INFO_REPLICATION_SERVER_CONNECTION_TO_RS
- .get(getReplicationServerId(), getServerId(),
+ logger.debug(INFO_REPLICATION_SERVER_CONNECTION_TO_RS, getReplicationServerId(), getServerId(),
replicationServerDomain.getBaseDN().toNormalizedString(),
session.getReadableRemoteAddress());
- logError(message);
super.finalizeStart();
}
@@ -372,11 +373,9 @@
if (inTopoMsg!=null)
replicationServerDomain.receiveTopoInfoFromRS(inTopoMsg, this, false);
- LocalizableMessage message = INFO_REPLICATION_SERVER_CONNECTION_FROM_RS
- .get(getReplicationServerId(), getServerId(),
+ logger.debug(INFO_REPLICATION_SERVER_CONNECTION_FROM_RS, getReplicationServerId(), getServerId(),
replicationServerDomain.getBaseDN().toNormalizedString(),
session.getReadableRemoteAddress());
- logError(message);
super.finalizeStart();
}
@@ -517,10 +516,8 @@
* and we have a null state ?
* replicationServerDomain.setGenerationId(generationId, false);
*/
- LocalizableMessage message = WARN_BAD_GENERATION_ID_FROM_RS.get(
- serverId, session.getReadableRemoteAddress(), generationId,
+ logger.warn(WARN_BAD_GENERATION_ID_FROM_RS, serverId, session.getReadableRemoteAddress(), generationId,
getBaseDNString(), getReplicationServerId(), localGenerationId);
- logError(message);
}
}
--
Gitblit v1.10.0