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/controls/GetEffectiveRights.java |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/opends/src/server/org/opends/server/controls/GetEffectiveRights.java b/opends/src/server/org/opends/server/controls/GetEffectiveRights.java
index 24f8777..358e7d0 100644
--- a/opends/src/server/org/opends/server/controls/GetEffectiveRights.java
+++ b/opends/src/server/org/opends/server/controls/GetEffectiveRights.java
@@ -38,8 +38,8 @@
 import org.opends.server.core.DirectoryServer;
 import static org.opends.server.messages.ProtocolMessages.*;
 import static org.opends.server.messages.MessageHandler.getMessage;
-import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
-import static org.opends.server.loggers.debug.DebugLogger.debugCaught;
+import static org.opends.server.loggers.debug.DebugLogger.*;
+import org.opends.server.loggers.debug.DebugTracer;
 
 import java.util.List;
 import java.util.ArrayList;
@@ -74,6 +74,11 @@
  *
  **/
 public class GetEffectiveRights extends Control {
+  /**
+   * The tracer object for the debug logger.
+   */
+  private static final DebugTracer TRACER = getTracer();
+
 
   //The DN representing the authzId. May be null.
   private DN authzDN=null;
@@ -200,7 +205,7 @@
       }
     } catch (ASN1Exception e) {
          if (debugEnabled()) {
-            debugCaught(DebugLogLevel.ERROR, e);
+            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
 
          int msgID = MSGID_GETEFFECTIVERIGHTS_DECODE_ERROR;
@@ -208,7 +213,7 @@
          throw new LDAPException(LDAPResultCode.PROTOCOL_ERROR, msgID, message);
     } catch (DirectoryException de) {
         if (debugEnabled()) {
-          debugCaught(DebugLogLevel.ERROR, de);
+          TRACER.debugCaught(DebugLogLevel.ERROR, de);
         }
 
         int msgID  = MSGID_CANNOT_DECODE_GETEFFECTIVERIGHTS_AUTHZID_DN;

--
Gitblit v1.10.0