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/tasks/InitializeTask.java |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/opends/src/server/org/opends/server/tasks/InitializeTask.java b/opends/src/server/org/opends/server/tasks/InitializeTask.java
index 0fcfd92..2733b89 100644
--- a/opends/src/server/org/opends/server/tasks/InitializeTask.java
+++ b/opends/src/server/org/opends/server/tasks/InitializeTask.java
@@ -28,8 +28,8 @@
 
 import static org.opends.server.config.ConfigConstants.*;
 import static org.opends.server.core.DirectoryServer.getAttributeType;
-import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
-import static org.opends.server.loggers.debug.DebugLogger.debugInfo;
+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.getMessage;
 
@@ -61,6 +61,11 @@
  */
 public class InitializeTask extends Task
 {
+  /**
+   * The tracer object for the debug logger.
+   */
+  private static final DebugTracer TRACER = getTracer();
+
   boolean isCompressed            = false;
   boolean isEncrypted             = false;
   boolean skipSchemaValidation    = false;
@@ -128,7 +133,7 @@
   {
     if (debugEnabled())
     {
-      debugInfo("InitializeTask is starting domain: %s source:%d",
+      TRACER.debugInfo("InitializeTask is starting domain: %s source:%d",
                 domain.getBaseDN(), source);
     }
     initState = getTaskState(); // RUNNING
@@ -162,7 +167,7 @@
 
     if (debugEnabled())
     {
-      debugInfo("InitializeTask is ending with state:%d", initState);
+      TRACER.debugInfo("InitializeTask is ending with state:%d", initState);
     }
     return initState;
   }
@@ -190,7 +195,7 @@
         logError(ErrorLogCategory.TASK,
             ErrorLogSeverity.SEVERE_ERROR,
             "setState: "+newState, 1);
-        debugInfo("InitializeTask/setState: ", newState);
+        TRACER.debugInfo("InitializeTask/setState: ", newState);
       }
       initState = newState;
       synchronized (initState)

--
Gitblit v1.10.0