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/DirectoryRMIClientSocketFactory.java |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/opends/src/server/org/opends/server/protocols/jmx/DirectoryRMIClientSocketFactory.java b/opends/src/server/org/opends/server/protocols/jmx/DirectoryRMIClientSocketFactory.java
index 417adef..26c5c12 100644
--- a/opends/src/server/org/opends/server/protocols/jmx/DirectoryRMIClientSocketFactory.java
+++ b/opends/src/server/org/opends/server/protocols/jmx/DirectoryRMIClientSocketFactory.java
@@ -26,9 +26,8 @@
  */
 package org.opends.server.protocols.jmx;
 
-import static org.opends.server.loggers.debug.DebugLogger.debugVerbose;
-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 java.io.IOException;
@@ -57,6 +56,11 @@
 public class DirectoryRMIClientSocketFactory implements
     RMIClientSocketFactory, Serializable
 {
+  /**
+   * The tracer object for the debug logger.
+   */
+  private static final DebugTracer TRACER = getTracer();
+
 
 
   /**
@@ -290,7 +294,7 @@
     {
       if (debugEnabled())
       {
-        debugVerbose("sslSocketFactory is null, get a new one");
+        TRACER.debugVerbose("sslSocketFactory is null, get a new one");
       }
 
       // socket factory not yet initialized
@@ -315,7 +319,7 @@
         {
           if (debugEnabled())
           {
-            debugCaught(DebugLogLevel.ERROR, e);
+            TRACER.debugCaught(DebugLogLevel.ERROR, e);
           }
           tms = null;
         }
@@ -345,7 +349,7 @@
       {
         if (debugEnabled())
         {
-          debugCaught(DebugLogLevel.ERROR, e);
+          TRACER.debugCaught(DebugLogLevel.ERROR, e);
         }
         throw new IOException("Unable to initialize SSL context : "
             + e.getMessage());

--
Gitblit v1.10.0