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/interop/LazyDN.java |   35 +++++++----------------------------
 1 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/opends/src/server/org/opends/server/interop/LazyDN.java b/opends/src/server/org/opends/server/interop/LazyDN.java
index 2af7b5a..71978c2 100644
--- a/opends/src/server/org/opends/server/interop/LazyDN.java
+++ b/opends/src/server/org/opends/server/interop/LazyDN.java
@@ -31,7 +31,9 @@
 import org.opends.server.types.DN;
 import org.opends.server.types.RDN;
 
-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;
 import static org.opends.server.util.StaticUtils.*;
 
 
@@ -55,10 +57,6 @@
 public class LazyDN
        extends DN
 {
-  /**
-   * The fully-qualified name of this class for debugging purposes.
-   */
-  private static final String CLASS_NAME = "org.opends.server.interop.LazyDN";
 
 
 
@@ -89,7 +87,6 @@
    */
   public LazyDN(String dnString)
   {
-    assert debugConstructor(CLASS_NAME, String.valueOf(dnString));
 
     this.dnString  = dnString;
     this.decodedDN = null;
@@ -104,7 +101,6 @@
   public boolean isNullDN()
          throws RuntimeException
   {
-    assert debugEnter(CLASS_NAME, "isNullDN");
 
     return getDecodedDN().isNullDN();
   }
@@ -118,7 +114,6 @@
   public int getNumComponents()
          throws RuntimeException
   {
-    assert debugEnter(CLASS_NAME, "getNumComponents");
 
     return getDecodedDN().getNumComponents();
   }
@@ -132,8 +127,6 @@
   public RDN getRDN()
          throws RuntimeException
   {
-    assert debugEnter(CLASS_NAME, "getRDN");
-
     return getDecodedDN().getRDN();
   }
 
@@ -146,7 +139,6 @@
   public RDN getRDN(int pos)
          throws RuntimeException
   {
-    assert debugEnter(CLASS_NAME, "getRDN", String.valueOf(pos));
 
     return getDecodedDN().getRDN(pos);
   }
@@ -160,7 +152,6 @@
   public DN getParent()
          throws RuntimeException
   {
-    assert debugEnter(CLASS_NAME, "getParent");
 
     return getDecodedDN().getParent();
   }
@@ -174,7 +165,6 @@
   public DN getParentDNInSuffix()
          throws RuntimeException
   {
-    assert debugEnter(CLASS_NAME, "getParentDNInSuffix");
 
     return getDecodedDN().getParentDNInSuffix();
   }
@@ -188,7 +178,6 @@
   public DN concat(RDN rdn)
          throws RuntimeException
   {
-    assert debugEnter(CLASS_NAME, "concat", String.valueOf(rdn));
 
     return getDecodedDN().concat(rdn);
   }
@@ -202,7 +191,6 @@
   public DN concat(RDN[] rdnComponents)
          throws RuntimeException
   {
-    assert debugEnter(CLASS_NAME, "concat", String.valueOf(rdnComponents));
 
     return getDecodedDN().concat(rdnComponents);
   }
@@ -216,7 +204,6 @@
   public DN concat(DN relativeBaseDN)
          throws RuntimeException
   {
-    assert debugEnter(CLASS_NAME, "concat", String.valueOf(relativeBaseDN));
 
     return getDecodedDN().concat(relativeBaseDN);
   }
@@ -230,7 +217,6 @@
   public boolean isDescendantOf(DN dn)
          throws RuntimeException
   {
-    assert debugEnter(CLASS_NAME, "isDescendantOf", String.valueOf(dn));
 
     return getDecodedDN().isDescendantOf(dn);
   }
@@ -244,7 +230,6 @@
   public boolean isAncestorOf(DN dn)
          throws RuntimeException
   {
-    assert debugEnter(CLASS_NAME, "isAncestorOf", String.valueOf(dn));
 
     return getDecodedDN().isAncestorOf(dn);
   }
@@ -258,7 +243,6 @@
   public boolean equals(Object o)
          throws RuntimeException
   {
-    assert debugEnter(CLASS_NAME, "equals", String.valueOf(o));
 
     return getDecodedDN().equals(o);
   }
@@ -272,7 +256,6 @@
   public int hashCode()
          throws RuntimeException
   {
-    assert debugEnter(CLASS_NAME, "hashCode");
 
     return getDecodedDN().hashCode();
   }
@@ -285,7 +268,6 @@
   @Override()
   public String toString()
   {
-    assert debugEnter(CLASS_NAME, "toString");
 
     return dnString;
   }
@@ -298,7 +280,6 @@
   @Override()
   public void toString(StringBuilder buffer)
   {
-    assert debugEnter(CLASS_NAME, "toString", "java.lang.StringBuilder");
 
     buffer.append(dnString);
   }
@@ -312,7 +293,6 @@
   public String toNormalizedString()
          throws RuntimeException
   {
-    assert debugEnter(CLASS_NAME, "toNormalizedString");
 
     return getDecodedDN().toNormalizedString();
   }
@@ -326,8 +306,6 @@
   public void toNormalizedString(StringBuilder buffer)
          throws RuntimeException
   {
-    assert debugEnter(CLASS_NAME, "toNormalizedString",
-                      "java.lang.StringBuilder");
 
     getDecodedDN().toNormalizedString(buffer);
   }
@@ -341,7 +319,6 @@
   public int compareTo(DN dn)
          throws RuntimeException
   {
-    assert debugEnter(CLASS_NAME, "compareTo", String.valueOf(dn));
 
     return getDecodedDN().compareTo(dn);
   }
@@ -358,7 +335,6 @@
   private DN getDecodedDN()
           throws RuntimeException
   {
-    assert debugEnter(CLASS_NAME, "getDecodedDN");
 
     if (decodedDN == null)
     {
@@ -368,7 +344,10 @@
       }
       catch (Exception e)
       {
-        assert debugException(CLASS_NAME, "getDecodedDN", e);
+        if (debugEnabled())
+        {
+          debugCought(DebugLogLevel.ERROR, e);
+        }
 
         throw new RuntimeException(stackTraceToSingleLineString(e));
       }

--
Gitblit v1.10.0