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/server/SafeDataExpectedAcksInfo.java | 19 +++++++------------
1 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/SafeDataExpectedAcksInfo.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/SafeDataExpectedAcksInfo.java
index 7bb883f..1a9d34b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/SafeDataExpectedAcksInfo.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/SafeDataExpectedAcksInfo.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock AS.
+ * Portions Copyright 2013-2014 ForgeRock AS.
*/
package org.opends.server.replication.server;
@@ -31,13 +31,11 @@
import java.util.List;
import java.util.Set;
-import org.opends.server.loggers.debug.DebugTracer;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.replication.common.AssuredMode;
import org.opends.server.replication.common.CSN;
import org.opends.server.replication.protocol.AckMsg;
-import static org.opends.server.loggers.debug.DebugLogger.*;
-
/**
* This class holds every info needed about the expected acks for a received
* update message requesting assured replication with Safe Data sub-mode.
@@ -46,10 +44,7 @@
*/
public class SafeDataExpectedAcksInfo extends ExpectedAcksInfo
{
- /**
- * The tracer object for the debug logger.
- */
- private static final DebugTracer TRACER = getTracer();
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
/** Requested level of safe data when the update message was received. */
private byte safeDataLevel = -1;
@@ -92,8 +87,8 @@
if (ackingServer.isDataServer())
{
// Sanity check: this should never happen
- if (debugEnabled())
- TRACER.debugInfo("Received unexpected SD ack from DS id: "
+ if (logger.isTraceEnabled())
+ logger.trace("Received unexpected SD ack from DS id: "
+ ackingServer.getServerId() + " ack message: " + ackMsg);
return false;
}
@@ -104,8 +99,8 @@
if (ackReceived)
{
// Sanity check: this should never happen
- if (debugEnabled())
- TRACER.debugInfo("Received unexpected ack from server id: " +
+ if (logger.isTraceEnabled())
+ logger.trace("Received unexpected ack from server id: " +
ackingServerId + " ack message: " + ackMsg);
return false;
} else
--
Gitblit v1.10.0