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/protocols/ldap/AbandonRequestProtocolOp.java |   28 ++++++++--------------------
 1 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/opends/src/server/org/opends/server/protocols/ldap/AbandonRequestProtocolOp.java b/opends/src/server/org/opends/server/protocols/ldap/AbandonRequestProtocolOp.java
index 02f023c..93398bc 100644
--- a/opends/src/server/org/opends/server/protocols/ldap/AbandonRequestProtocolOp.java
+++ b/opends/src/server/org/opends/server/protocols/ldap/AbandonRequestProtocolOp.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.protocols.ldap;
 
@@ -30,7 +30,9 @@
 
 import org.opends.server.protocols.asn1.ASN1Element;
 import org.opends.server.protocols.asn1.ASN1Integer;
-import static org.opends.server.loggers.Debug.*;
+import org.opends.server.types.DebugLogLevel;
+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.protocols.ldap.LDAPConstants.*;
@@ -47,11 +49,6 @@
 public class AbandonRequestProtocolOp
        extends ProtocolOp
 {
-  /**
-   * The fully-qualified name of this class to use for debugging purposes.
-   */
-  private static final String CLASS_NAME =
-       "org.opends.server.protocols.ldap.AbandonRequestProtocolOp";
 
 
 
@@ -68,7 +65,6 @@
    */
   public AbandonRequestProtocolOp(int idToAbandon)
   {
-    assert debugConstructor(CLASS_NAME, String.valueOf(idToAbandon));
 
     this.idToAbandon = idToAbandon;
   }
@@ -82,7 +78,6 @@
    */
   public int getIDToAbandon()
   {
-    assert debugEnter(CLASS_NAME, "getIDToAbandon");
 
     return idToAbandon;
   }
@@ -96,8 +91,6 @@
    */
   public void setIDToAbandon(int idToAbandon)
   {
-    assert debugEnter(CLASS_NAME, "setIDToAbandon",
-                      String.valueOf(idToAbandon));
 
     this.idToAbandon = idToAbandon;
   }
@@ -111,7 +104,6 @@
    */
   public byte getType()
   {
-    assert debugEnter(CLASS_NAME, "getType");
 
     return OP_TYPE_ABANDON_REQUEST;
   }
@@ -125,7 +117,6 @@
    */
   public String getProtocolOpName()
   {
-    assert debugEnter(CLASS_NAME, "getProtocolOpName");
 
     return "Abandon Request";
   }
@@ -140,7 +131,6 @@
    */
   public ASN1Element encode()
   {
-    assert debugEnter(CLASS_NAME, "encode");
 
     return new ASN1Integer(OP_TYPE_ABANDON_REQUEST, idToAbandon);
   }
@@ -161,8 +151,6 @@
                                                                    element)
          throws LDAPException
   {
-    assert debugEnter(CLASS_NAME, "decodeAbandonRequest",
-                      String.valueOf(element));
 
     int idToAbandon;
     try
@@ -171,7 +159,10 @@
     }
     catch (Exception e)
     {
-      assert debugException(CLASS_NAME, "decodeAbandonRequest", e);
+      if (debugEnabled())
+      {
+        debugCought(DebugLogLevel.ERROR, e);
+      }
 
       int msgID = MSGID_LDAP_ABANDON_REQUEST_DECODE_ID;
       String message = getMessage(msgID, String.valueOf(e));
@@ -191,7 +182,6 @@
    */
   public void toString(StringBuilder buffer)
   {
-    assert debugEnter(CLASS_NAME, "toString", "java.lang.StringBuilder");
 
     buffer.append("AbandonRequest(idToAbandon=");
     buffer.append(idToAbandon);
@@ -210,8 +200,6 @@
    */
   public void toString(StringBuilder buffer, int indent)
   {
-    assert debugEnter(CLASS_NAME, "toString", "java.lang.StringBuilder",
-                      String.valueOf(indent));
 
     StringBuilder indentBuf = new StringBuilder(indent);
     for (int i=0 ; i < indent; i++)

--
Gitblit v1.10.0