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/controls/LDAPAssertionRequestControl.java |   31 ++++++++-----------------------
 1 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/opends/src/server/org/opends/server/controls/LDAPAssertionRequestControl.java b/opends/src/server/org/opends/server/controls/LDAPAssertionRequestControl.java
index 445176b..a876ac7 100644
--- a/opends/src/server/org/opends/server/controls/LDAPAssertionRequestControl.java
+++ b/opends/src/server/org/opends/server/controls/LDAPAssertionRequestControl.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.controls;
 
@@ -37,8 +37,10 @@
 import org.opends.server.types.Control;
 import org.opends.server.types.DirectoryException;
 import org.opends.server.types.SearchFilter;
+import org.opends.server.types.DebugLogLevel;
 
-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 static org.opends.server.messages.MessageHandler.*;
 import static org.opends.server.messages.ProtocolMessages.*;
 import static org.opends.server.util.ServerConstants.*;
@@ -55,11 +57,6 @@
 public class LDAPAssertionRequestControl
        extends Control
 {
-  /**
-   * The fully-qualified name of this class for debugging purposes.
-   */
-  private static final String CLASS_NAME =
-       "org.opends.server.controls.LDAPAssertionRequestControl";
 
 
 
@@ -85,8 +82,6 @@
     super(OID_LDAP_ASSERTION, isCritical,
           new ASN1OctetString(rawFilter.encode().encode()));
 
-    assert debugConstructor(CLASS_NAME, String.valueOf(isCritical),
-                            String.valueOf(rawFilter));
 
     this.rawFilter = rawFilter;
 
@@ -110,9 +105,6 @@
   {
     super(oid, isCritical, new ASN1OctetString(rawFilter.encode().encode()));
 
-    assert debugConstructor(CLASS_NAME, String.valueOf(oid),
-                            String.valueOf(isCritical),
-                            String.valueOf(rawFilter));
 
     this.rawFilter = rawFilter;
 
@@ -138,10 +130,6 @@
   {
     super(oid, isCritical, encodedValue);
 
-    assert debugConstructor(CLASS_NAME, String.valueOf(oid),
-                            String.valueOf(isCritical),
-                            String.valueOf(rawFilter),
-                            String.valueOf(encodedValue));
 
     this.rawFilter = rawFilter;
 
@@ -165,7 +153,6 @@
   public static LDAPAssertionRequestControl decodeControl(Control control)
          throws LDAPException
   {
-    assert debugEnter(CLASS_NAME, "decodeControl", String.valueOf(control));
 
     if (! control.hasValue())
     {
@@ -182,7 +169,10 @@
     }
     catch (ASN1Exception ae)
     {
-      assert debugException(CLASS_NAME, "decodeControl", ae);
+      if (debugEnabled())
+      {
+        debugCought(DebugLogLevel.ERROR, ae);
+      }
 
       int    msgID   = MSGID_LDAPASSERT_INVALID_CONTROL_VALUE;
       String message = getMessage(msgID, ae.getMessage());
@@ -206,7 +196,6 @@
    */
   public LDAPFilter getRawFilter()
   {
-    assert debugEnter(CLASS_NAME, "getRawFilter");
 
     return rawFilter;
   }
@@ -221,7 +210,6 @@
    */
   public void setRawFilter(LDAPFilter rawFilter)
   {
-    assert debugEnter(CLASS_NAME, "setRawFilter", String.valueOf(rawFilter));
 
     this.rawFilter = rawFilter;
     this.filter    = null;
@@ -242,7 +230,6 @@
   public SearchFilter getSearchFilter()
          throws DirectoryException
   {
-    assert debugEnter(CLASS_NAME, "getSearchFilter");
 
     if (filter == null)
     {
@@ -261,7 +248,6 @@
    */
   public String toString()
   {
-    assert debugEnter(CLASS_NAME, "toString");
 
     StringBuilder buffer = new StringBuilder();
     toString(buffer);
@@ -278,7 +264,6 @@
    */
   public void toString(StringBuilder buffer)
   {
-    assert debugEnter(CLASS_NAME, "toString", "java.lang.StringBuilder");
 
     buffer.append("LDAPAssertionRequestControl(criticality=");
     buffer.append(isCritical());

--
Gitblit v1.10.0