From acee9ea190e753f832be588eb384522a6d65ed84 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.

---
 opendj-sdk/opends/src/server/org/opends/server/loggers/AccessLogger.java |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/AccessLogger.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/AccessLogger.java
index b27e578..4c33238 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/AccessLogger.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/AccessLogger.java
@@ -45,8 +45,8 @@
 import org.opends.server.admin.server.ConfigurationDeleteListener;
 import org.opends.server.admin.ClassPropertyDefinition;
 import org.opends.server.config.ConfigException;
-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 static org.opends.server.messages.ConfigMessages.
     MSGID_CONFIG_LOGGER_CANNOT_CREATE_LOGGER;
 import static org.opends.server.messages.ConfigMessages.
@@ -64,6 +64,11 @@
     ConfigurationDeleteListener<AccessLogPublisherCfg>,
     ConfigurationChangeListener<AccessLogPublisherCfg>
 {
+  /**
+   * The tracer object for the debug logger.
+   */
+  private static final DebugTracer TRACER = getTracer();
+
   // The set of access loggers that have been registered with the server.  It
    // will initially be empty.
    static ConcurrentHashMap<DN, AccessLogPublisher> accessPublishers =
@@ -197,7 +202,7 @@
        {
          if (debugEnabled())
          {
-           debugCaught(DebugLogLevel.ERROR, e);
+           TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          messages.add(e.getMessage());
          resultCode = DirectoryServer.getServerErrorResultCode();
@@ -206,7 +211,7 @@
        {
          if (debugEnabled())
          {
-           debugCaught(DebugLogLevel.ERROR, e);
+           TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
          int msgID = MSGID_CONFIG_LOGGER_CANNOT_CREATE_LOGGER;
          messages.add(getMessage(msgID, String.valueOf(config.dn().toString()),

--
Gitblit v1.10.0