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/api/ClientConnection.java |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/opends/src/server/org/opends/server/api/ClientConnection.java b/opends/src/server/org/opends/server/api/ClientConnection.java
index 5ff8769..bc8b7e4 100644
--- a/opends/src/server/org/opends/server/api/ClientConnection.java
+++ b/opends/src/server/org/opends/server/api/ClientConnection.java
@@ -61,6 +61,7 @@
 
 import static org.opends.server.config.ConfigConstants.*;
 import static org.opends.server.loggers.debug.DebugLogger.*;
+import org.opends.server.loggers.debug.DebugTracer;
 import static org.opends.server.messages.CoreMessages.*;
 import static org.opends.server.messages.MessageHandler.*;
 import static org.opends.server.util.StaticUtils.*;
@@ -73,6 +74,11 @@
  */
 public abstract class ClientConnection
 {
+  /**
+   * The tracer object for the debug logger.
+   */
+  private static final DebugTracer TRACER = getTracer();
+
   // The set of authentication information for this client connection.
   private AuthenticationInfo authenticationInfo;
 
@@ -185,7 +191,7 @@
     {
       if (debugEnabled())
       {
-        debugCaught(DebugLogLevel.ERROR, e);
+        TRACER.debugCaught(DebugLogLevel.ERROR, e);
       }
     }
   }
@@ -960,7 +966,7 @@
         String message = getMessage(msgID, getConnectionID(), -1L,
                                     String.valueOf(authDN),
                                     privilege.getName(), result);
-        debugMessage(DebugLogLevel.INFO, message);
+        TRACER.debugMessage(DebugLogLevel.INFO, message);
       }
       else
       {
@@ -971,7 +977,7 @@
                                     operation.getOperationID(),
                                     String.valueOf(authDN),
                                     privilege.getName(), result);
-        debugMessage(DebugLogLevel.INFO, message);
+        TRACER.debugMessage(DebugLogLevel.INFO, message);
       }
     }
 
@@ -1042,7 +1048,7 @@
         String message = getMessage(msgID, getConnectionID(), -1L,
                                     String.valueOf(authDN),
                                     buffer.toString(), result);
-        debugMessage(DebugLogLevel.INFO, message);
+        TRACER.debugMessage(DebugLogLevel.INFO, message);
       }
       else
       {
@@ -1053,7 +1059,7 @@
                                     operation.getOperationID(),
                                     String.valueOf(authDN),
                                     buffer.toString(), result);
-        debugMessage(DebugLogLevel.INFO, message);
+        TRACER.debugMessage(DebugLogLevel.INFO, message);
       }
 
       return result;

--
Gitblit v1.10.0