From 1d5d1a6a4a0a58d6bb4803527dacb6641c027816 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Tue, 28 Jan 2014 13:34:12 +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/protocol/Session.java | 28 ++++++++++++----------------
1 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/protocol/Session.java b/opendj3-server-dev/src/server/org/opends/server/replication/protocol/Session.java
index d156619..147bc16 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/protocol/Session.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/protocol/Session.java
@@ -22,13 +22,12 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2013 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.replication.protocol;
-import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.util.StaticUtils.*;
import java.io.*;
@@ -45,7 +44,7 @@
import javax.net.ssl.SSLSocket;
import org.opends.server.api.DirectoryThread;
-import org.opends.server.loggers.debug.DebugTracer;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.util.StaticUtils;
@@ -55,10 +54,7 @@
*/
public final class Session extends DirectoryThread implements Closeable
{
- /**
- * The tracer object for the debug logger.
- */
- private static final DebugTracer TRACER = getTracer();
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
private final Socket plainSocket;
private final SSLSocket secureSocket;
@@ -132,9 +128,9 @@
{
super("Replication Session from "+ socket.getLocalSocketAddress() +
" to " + socket.getRemoteSocketAddress());
- if (debugEnabled())
+ if (logger.isTraceEnabled())
{
- TRACER.debugInfo(
+ logger.trace(
"Creating Session from %s to %s in %s",
socket.getLocalSocketAddress(),
socket.getRemoteSocketAddress(),
@@ -185,11 +181,11 @@
}
// Perform close outside of critical section.
- if (debugEnabled())
+ if (logger.isTraceEnabled())
{
if (localSessionError == null)
{
- TRACER.debugInfo(
+ logger.trace(
"Closing Session from %s to %s in %s",
plainSocket.getLocalSocketAddress(),
plainSocket.getRemoteSocketAddress(),
@@ -197,7 +193,7 @@
}
else
{
- TRACER.debugInfo(
+ logger.trace(
"Aborting Session from %s to %s in %s due to the "
+ "following error: %s",
plainSocket.getLocalSocketAddress(),
@@ -576,9 +572,9 @@
{
isRunning.set(true);
latch.countDown();
- if (debugEnabled())
+ if (logger.isTraceEnabled())
{
- TRACER.debugInfo(this.getName() + " starting.");
+ logger.trace(this.getName() + " starting.");
}
boolean needClosing = false;
while (!closeInitiated)
@@ -607,9 +603,9 @@
{
close();
}
- if (debugEnabled())
+ if (logger.isTraceEnabled())
{
- TRACER.debugInfo(this.getName() + " stopped.");
+ logger.trace(this.getName() + " stopped.");
}
}
--
Gitblit v1.10.0