From 455897cc245b67d929f409a93cfa7106e835cc1f Mon Sep 17 00:00:00 2001
From: boli <boli@localhost>
Date: Thu, 01 Mar 2007 03:27:06 +0000
Subject: [PATCH] This removes old debug logging framework method calls that are going to be automatically instrumented by AspectJ. Non instrumented debug method calls are updated to use the new debug framework methods. However, the new debug logging framework is not yet active as the Aspects are not weaved in. After this revision, debug logging will be disabled in the server until the new AOP framework is complete. 

---
 opends/src/server/org/opends/server/plugins/profiler/ProfileStack.java |   37 ++++++++++++-------------------------
 1 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/opends/src/server/org/opends/server/plugins/profiler/ProfileStack.java b/opends/src/server/org/opends/server/plugins/profiler/ProfileStack.java
index f06a873..8936797 100644
--- a/opends/src/server/org/opends/server/plugins/profiler/ProfileStack.java
+++ b/opends/src/server/org/opends/server/plugins/profiler/ProfileStack.java
@@ -22,7 +22,7 @@
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.plugins.profiler;
 
@@ -33,8 +33,9 @@
 import org.opends.server.protocols.asn1.ASN1OctetString;
 import org.opends.server.protocols.asn1.ASN1Sequence;
 
-import static org.opends.server.loggers.Debug.*;
-
+import static org.opends.server.loggers.debug.DebugLogger.debugCought;
+import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
+import org.opends.server.types.DebugLogLevel;
 
 
 /**
@@ -43,11 +44,6 @@
  */
 public class ProfileStack
 {
-  /**
-   * The fully-qualified name of this class for debugging purposes.
-   */
-  private static final String CLASS_NAME =
-       "org.opends.server.plugins.profiler.ProfileStack";
 
 
 
@@ -89,7 +85,6 @@
    */
   public ProfileStack(StackTraceElement[] stackElements)
   {
-    assert debugConstructor(CLASS_NAME, String.valueOf(stackElements));
 
     numFrames   = stackElements.length;
     classNames  = new String[numFrames];
@@ -128,9 +123,6 @@
   private ProfileStack(String[] classNames, String[] methodNames,
                        int[] lineNumbers)
   {
-    assert debugConstructor(CLASS_NAME, String.valueOf(classNames),
-                            String.valueOf(methodNames),
-                            String.valueOf(lineNumbers));
 
     this.numFrames   = classNames.length;
     this.classNames  = classNames;
@@ -147,7 +139,6 @@
    */
   public int getNumFrames()
   {
-    assert debugEnter(CLASS_NAME, "getDepth");
 
     return numFrames;
   }
@@ -161,7 +152,6 @@
    */
   public String[] getClassNames()
   {
-    assert debugEnter(CLASS_NAME, "getClassNames");
 
     return classNames;
   }
@@ -178,7 +168,6 @@
    */
   public String getClassName(int depth)
   {
-    assert debugEnter(CLASS_NAME, "getClassName", String.valueOf(depth));
 
     return classNames[depth];
   }
@@ -192,7 +181,6 @@
    */
   public String[] getMethodNames()
   {
-    assert debugEnter(CLASS_NAME, "getMethodNames");
 
     return methodNames;
   }
@@ -209,7 +197,6 @@
    */
   public String getMethodName(int depth)
   {
-    assert debugEnter(CLASS_NAME, "getMethodName", String.valueOf(depth));
 
     return methodNames[depth];
   }
@@ -223,7 +210,6 @@
    */
   public int[] getLineNumbers()
   {
-    assert debugEnter(CLASS_NAME, "getLineNumbers");
 
     return lineNumbers;
   }
@@ -240,7 +226,6 @@
    */
   public int getLineNumber(int depth)
   {
-    assert debugEnter(CLASS_NAME, "getLineNumber", String.valueOf(depth));
 
     return lineNumbers[depth];
   }
@@ -256,7 +241,6 @@
    */
   public int hashCode()
   {
-    assert debugEnter(CLASS_NAME, "hashCode");
 
     if (numFrames == 0)
     {
@@ -282,7 +266,6 @@
    */
   public boolean equals(Object o)
   {
-    assert debugEnter(CLASS_NAME, "equals", String.valueOf(o));
 
     if (o == null)
     {
@@ -317,7 +300,10 @@
     }
     catch (Exception e)
     {
-      assert debugException(CLASS_NAME, "equals", e);
+      if (debugEnabled())
+      {
+        debugCought(DebugLogLevel.ERROR, e);
+      }
 
       return false;
     }
@@ -333,7 +319,6 @@
    */
   public ASN1Element encode()
   {
-    assert debugEnter(CLASS_NAME, "encode");
 
     ArrayList<ASN1Element> elements = new ArrayList<ASN1Element>(3*numFrames);
     for (int i=0; i < numFrames; i++)
@@ -359,7 +344,6 @@
    */
   public static ProfileStack decode(ASN1Element stackElement)
   {
-    assert debugEnter(CLASS_NAME, "decode", String.valueOf(stackElement));
 
     try
     {
@@ -384,7 +368,10 @@
     }
     catch (Exception e)
     {
-      assert debugException(CLASS_NAME, "decode", e);
+      if (debugEnabled())
+      {
+        debugCought(DebugLogLevel.ERROR, e);
+      }
 
       return null;
     }

--
Gitblit v1.10.0