From b0a7e3cf4a65ea95c79cf002596428d0aed2e26e Mon Sep 17 00:00:00 2001
From: boli <boli@localhost>
Date: Tue, 22 May 2007 23:30:15 +0000
Subject: [PATCH] Remove the dependence on AspectJ for all non method-entry and method-exit related debug messages. All debug statements will now work w/o weaving enabled. However, method-entry and method-exit debug messages work only with weaving enabled.
---
opends/src/server/org/opends/server/util/EMailMessage.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/opends/src/server/org/opends/server/util/EMailMessage.java b/opends/src/server/org/opends/server/util/EMailMessage.java
index 627bb1a..b24c84c 100644
--- a/opends/src/server/org/opends/server/util/EMailMessage.java
+++ b/opends/src/server/org/opends/server/util/EMailMessage.java
@@ -47,8 +47,8 @@
import org.opends.server.core.DirectoryServer;
-import static org.opends.server.loggers.debug.DebugLogger.debugCaught;
-import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
+import static org.opends.server.loggers.debug.DebugLogger.*;
+import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.DebugLogLevel;
import static org.opends.server.messages.MessageHandler.*;
import static org.opends.server.messages.UtilityMessages.*;
@@ -61,7 +61,10 @@
*/
public class EMailMessage
{
-
+ /**
+ * The tracer object for the debug logger.
+ */
+ private static final DebugTracer TRACER = getTracer();
// The addresses of the recipients to whom this message should be sent.
@@ -357,7 +360,7 @@
{
if (debugEnabled())
{
- debugCaught(DebugLogLevel.ERROR, me);
+ TRACER.debugCaught(DebugLogLevel.ERROR, me);
}
int msgID = MSGID_EMAILMSG_INVALID_SENDER_ADDRESS;
@@ -383,7 +386,7 @@
{
if (debugEnabled())
{
- debugCaught(DebugLogLevel.ERROR, me);
+ TRACER.debugCaught(DebugLogLevel.ERROR, me);
}
int msgID = MSGID_EMAILMSG_INVALID_RECIPIENT_ADDRESS;
@@ -429,7 +432,7 @@
{
if (debugEnabled())
{
- debugCaught(DebugLogLevel.ERROR, sfe);
+ TRACER.debugCaught(DebugLogLevel.ERROR, sfe);
}
// We'll ignore this and hope that another server is available. If not,
--
Gitblit v1.10.0