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

diff --git a/opends/src/server/org/opends/server/core/LogRetentionPolicyConfigManager.java b/opends/src/server/org/opends/server/core/LogRetentionPolicyConfigManager.java
index 86cda49..ae99da9 100644
--- a/opends/src/server/org/opends/server/core/LogRetentionPolicyConfigManager.java
+++ b/opends/src/server/org/opends/server/core/LogRetentionPolicyConfigManager.java
@@ -41,8 +41,8 @@
 import org.opends.server.loggers.RetentionPolicy;
 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.MessageHandler.getMessage;
 import static org.opends.server.messages.ConfigMessages.*;
 import static org.opends.server.util.StaticUtils.*;
@@ -63,6 +63,11 @@
     ConfigurationDeleteListener<LogRetentionPolicyCfg>,
     ConfigurationChangeListener<LogRetentionPolicyCfg>
 {
+  /**
+   * The tracer object for the debug logger.
+   */
+  private static final DebugTracer TRACER = getTracer();
+
 
   /**
    * Initializes all the log retention policies.
@@ -134,14 +139,14 @@
     catch (ConfigException e) {
       if (debugEnabled())
       {
-        debugCaught(DebugLogLevel.ERROR, e);
+        TRACER.debugCaught(DebugLogLevel.ERROR, e);
       }
       messages.add(e.getMessage());
       resultCode = DirectoryServer.getServerErrorResultCode();
     } catch (Exception e) {
       if (debugEnabled())
       {
-        debugCaught(DebugLogLevel.ERROR, e);
+        TRACER.debugCaught(DebugLogLevel.ERROR, e);
       }
       int msgID = MSGID_CONFIG_RETENTION_POLICY_CANNOT_CREATE_POLICY;
       messages.add(getMessage(msgID, String.valueOf(config.dn().toString()),

--
Gitblit v1.10.0