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/util/EMailMessage.java | 24 +++++-------------------
1 files changed, 5 insertions(+), 19 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/util/EMailMessage.java b/opendj3-server-dev/src/server/org/opends/server/util/EMailMessage.java
index 044f042..ca78038 100644
--- a/opendj3-server-dev/src/server/org/opends/server/util/EMailMessage.java
+++ b/opendj3-server-dev/src/server/org/opends/server/util/EMailMessage.java
@@ -51,8 +51,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.loggers.debug.DebugTracer;
-import org.opends.server.types.DebugLogLevel;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.util.args.ArgumentException;
import org.opends.server.util.args.ArgumentParser;
import org.opends.server.util.args.BooleanArgument;
@@ -60,7 +59,6 @@
import static org.opends.messages.ToolMessages.*;
import static org.opends.messages.UtilityMessages.*;
-import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -78,10 +76,7 @@
mayInvoke=true)
public final class EMailMessage
{
- /**
- * The tracer object for the debug logger.
- */
- private static final DebugTracer TRACER = getTracer();
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
// The addresses of the recipients to whom this message should be sent.
@@ -398,10 +393,7 @@
}
catch (MessagingException me)
{
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, me);
- }
+ logger.traceException(me);
LocalizableMessage msg = ERR_EMAILMSG_INVALID_SENDER_ADDRESS.get(
String.valueOf(sender), me.getMessage());
@@ -423,10 +415,7 @@
}
catch (MessagingException me)
{
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, me);
- }
+ logger.traceException(me);
LocalizableMessage msg = ERR_EMAILMSG_INVALID_RECIPIENT_ADDRESS.get(
String.valueOf(recipient), me.getMessage());
@@ -473,10 +462,7 @@
}
catch (SendFailedException sfe)
{
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, sfe);
- }
+ logger.traceException(sfe);
// We'll ignore this and hope that another server is available. If not,
// then at least save the exception so that we can throw it if all else
--
Gitblit v1.10.0