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/protocols/jmx/RmiAuthenticator.java |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/opends/src/server/org/opends/server/protocols/jmx/RmiAuthenticator.java b/opends/src/server/org/opends/server/protocols/jmx/RmiAuthenticator.java
index 3cf323b..70e6069 100644
--- a/opends/src/server/org/opends/server/protocols/jmx/RmiAuthenticator.java
+++ b/opends/src/server/org/opends/server/protocols/jmx/RmiAuthenticator.java
@@ -44,9 +44,8 @@
 import org.opends.server.types.AuthenticationInfo;
 import org.opends.server.types.LDAPException;
 
-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.debugVerbose;
+import static org.opends.server.loggers.debug.DebugLogger.*;
+import org.opends.server.loggers.debug.DebugTracer;
 import org.opends.server.types.DebugLogLevel;
 
 /**
@@ -57,6 +56,11 @@
  */
 public class RmiAuthenticator implements JMXAuthenticator
 {
+  /**
+   * The tracer object for the debug logger.
+   */
+  private static final DebugTracer TRACER = getTracer();
+
 
     /**
      * The client authencation mode. <code>true</code> indicates that the
@@ -141,7 +145,7 @@
     {
       if (debugEnabled())
       {
-        debugVerbose("User name is Null");
+        TRACER.debugVerbose("User name is Null");
       }
       SecurityException se = new SecurityException();
       throw se;
@@ -150,7 +154,7 @@
     {
       if (debugEnabled())
       {
-        debugVerbose("User password is Null ");
+        TRACER.debugVerbose("User password is Null ");
       }
 
       SecurityException se = new SecurityException();
@@ -159,7 +163,7 @@
 
     if (debugEnabled())
     {
-      debugVerbose("UserName = %s", authcID);
+      TRACER.debugVerbose("UserName = %s", authcID);
     }
 
     //
@@ -177,7 +181,7 @@
     {
       if (debugEnabled())
       {
-        debugCaught(DebugLogLevel.ERROR, e);
+        TRACER.debugCaught(DebugLogLevel.ERROR, e);
       }
       SecurityException se = new SecurityException();
       se.initCause(e);
@@ -268,7 +272,7 @@
     {
       if (debugEnabled())
       {
-        debugVerbose("User is authenticated");
+        TRACER.debugVerbose("User is authenticated");
       }
 
       authInfo = bindOp.getAuthenticationInfo();

--
Gitblit v1.10.0