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/tools/LDAPSearch.java |   24 +++++++++++++++---------
 1 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/opends/src/server/org/opends/server/tools/LDAPSearch.java b/opends/src/server/org/opends/server/tools/LDAPSearch.java
index c54aaf0..2d931e1 100644
--- a/opends/src/server/org/opends/server/tools/LDAPSearch.java
+++ b/opends/src/server/org/opends/server/tools/LDAPSearch.java
@@ -74,6 +74,7 @@
 import org.opends.server.types.*;
 
 import static org.opends.server.loggers.debug.DebugLogger.*;
+import org.opends.server.loggers.debug.DebugTracer;
 import static org.opends.server.messages.MessageHandler.*;
 import static org.opends.server.messages.ToolMessages.*;
 import static org.opends.server.protocols.ldap.LDAPConstants.*;
@@ -92,6 +93,11 @@
 public class LDAPSearch
 {
   /**
+   * The tracer object for the debug logger.
+   */
+  private static final DebugTracer TRACER = getTracer();
+
+  /**
    * The fully-qualified name of this class.
    */
   private static final String CLASS_NAME = "org.opends.server.tools.LDAPSearch";
@@ -390,7 +396,7 @@
         {
           if (debugEnabled())
           {
-            debugCaught(DebugLogLevel.ERROR, ae);
+            TRACER.debugCaught(DebugLogLevel.ERROR, ae);
           }
           throw new IOException(ae.getMessage());
         }
@@ -987,7 +993,7 @@
       {
         if (debugEnabled())
         {
-          debugCaught(DebugLogLevel.ERROR, le);
+          TRACER.debugCaught(DebugLogLevel.ERROR, le);
         }
         err.println(wrapText(le.getMessage(), MAX_LINE_WIDTH));
         return 1;
@@ -1045,7 +1051,7 @@
     {
       if (debugEnabled())
       {
-        debugCaught(DebugLogLevel.ERROR, ae);
+        TRACER.debugCaught(DebugLogLevel.ERROR, ae);
       }
       err.println(wrapText(ae.getMessage(), MAX_LINE_WIDTH));
       return 1;
@@ -1066,7 +1072,7 @@
     {
       if (debugEnabled())
       {
-        debugCaught(DebugLogLevel.ERROR, ae);
+        TRACER.debugCaught(DebugLogLevel.ERROR, ae);
       }
       err.println(wrapText(ae.getMessage(), MAX_LINE_WIDTH));
       return 1;
@@ -1096,7 +1102,7 @@
       {
         if (debugEnabled())
         {
-          debugCaught(DebugLogLevel.ERROR, ex);
+          TRACER.debugCaught(DebugLogLevel.ERROR, ex);
         }
         err.println(wrapText(ex.getMessage(), MAX_LINE_WIDTH));
         return 1;
@@ -1532,7 +1538,7 @@
       {
         if (debugEnabled())
         {
-          debugCaught(DebugLogLevel.ERROR, e);
+          TRACER.debugCaught(DebugLogLevel.ERROR, e);
         }
         err.println(wrapText(e.getMessage(), MAX_LINE_WIDTH));
         return 1;
@@ -1697,7 +1703,7 @@
     {
       if (debugEnabled())
       {
-        debugCaught(DebugLogLevel.ERROR, le);
+        TRACER.debugCaught(DebugLogLevel.ERROR, le);
       }
 
       LDAPToolUtils.printErrorMessage(err, le.getMessage(), le.getResultCode(),
@@ -1708,7 +1714,7 @@
     {
       if (debugEnabled())
       {
-        debugCaught(DebugLogLevel.ERROR, lce);
+        TRACER.debugCaught(DebugLogLevel.ERROR, lce);
       }
       LDAPToolUtils.printErrorMessage(err, lce.getMessage(),
                                       lce.getResultCode(),
@@ -1720,7 +1726,7 @@
     {
       if (debugEnabled())
       {
-        debugCaught(DebugLogLevel.ERROR, e);
+        TRACER.debugCaught(DebugLogLevel.ERROR, e);
       }
       err.println(wrapText(e.getMessage(), MAX_LINE_WIDTH));
       return 1;

--
Gitblit v1.10.0