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

diff --git a/opends/src/server/org/opends/server/loggers/SizeBasedRotationPolicy.java b/opends/src/server/org/opends/server/loggers/SizeBasedRotationPolicy.java
index ab88405..b38afc0 100644
--- a/opends/src/server/org/opends/server/loggers/SizeBasedRotationPolicy.java
+++ b/opends/src/server/org/opends/server/loggers/SizeBasedRotationPolicy.java
@@ -27,8 +27,8 @@
 package org.opends.server.loggers;
 
 
-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 org.opends.server.admin.std.server.SizeLimitLogRotationPolicyCfg;
 import org.opends.server.admin.server.ConfigurationChangeListener;
 import org.opends.server.types.InitializationException;
@@ -47,6 +47,11 @@
     RotationPolicy<SizeLimitLogRotationPolicyCfg>,
     ConfigurationChangeListener<SizeLimitLogRotationPolicyCfg>
 {
+  /**
+   * The tracer object for the debug logger.
+   */
+  private static final DebugTracer TRACER = getTracer();
+
 
   private long sizeLimit;
 
@@ -101,15 +106,16 @@
   */
   public boolean rotateFile(MultifileTextWriter writer)
   {
-    if (writer.getBytesWritten() >= sizeLimit)
+    long fileSize = writer.getBytesWritten();
+
+    if (debugEnabled())
     {
-      if (debugEnabled())
-      {
-        debugInfo("%d bytes written in current file", writer.getBytesWritten());
-      }
-      return true;
+      TRACER.debugInfo("%d bytes written in current log file. " +
+          "Next rotation occurs at %d bytes", writer.getBytesWritten(),
+                                              sizeLimit);
     }
-    return false;
+
+    return fileSize >= sizeLimit;
   }
 
 }

--
Gitblit v1.10.0