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/core/ExtendedOperation.java | 49 ++++++++-----------------------------------------
1 files changed, 8 insertions(+), 41 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/ExtendedOperation.java b/opends/src/server/org/opends/server/core/ExtendedOperation.java
index 37a9514..156a48f 100644
--- a/opends/src/server/org/opends/server/core/ExtendedOperation.java
+++ b/opends/src/server/org/opends/server/core/ExtendedOperation.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.core;
@@ -52,7 +52,9 @@
import static org.opends.server.core.CoreConstants.*;
import static org.opends.server.loggers.Access.*;
-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.messages.CoreMessages.*;
import static org.opends.server.messages.MessageHandler.*;
import static org.opends.server.util.ServerConstants.*;
@@ -68,10 +70,6 @@
implements PreParseExtendedOperation, PreOperationExtendedOperation,
PostOperationExtendedOperation, PostResponseExtendedOperation
{
- /*** The fully-qualified name of this class for debugging purposes.
- */
- private static final String CLASS_NAME =
- "org.opends.server.core.ExtendedOperation";
@@ -124,16 +122,6 @@
{
super(clientConnection, operationID, messageID, requestControls);
- assert debugConstructor(CLASS_NAME,
- new String[]
- {
- String.valueOf(clientConnection),
- String.valueOf(operationID),
- String.valueOf(messageID),
- String.valueOf(requestControls),
- String.valueOf(requestOID),
- String.valueOf(requestValue)
- });
this.requestOID = requestOID;
this.requestValue = requestValue;
@@ -154,7 +142,6 @@
*/
public final String getRequestOID()
{
- assert debugEnter(CLASS_NAME, "getRequestOID");
return requestOID;
}
@@ -170,7 +157,6 @@
*/
public final void setRequestOID(String requestOID)
{
- assert debugEnter(CLASS_NAME, "setRequestOID", String.valueOf(requestOID));
this.requestOID = requestOID;
}
@@ -185,7 +171,6 @@
*/
public final ASN1OctetString getRequestValue()
{
- assert debugEnter(CLASS_NAME, "getRequestValue");
return requestValue;
}
@@ -201,8 +186,6 @@
*/
public final void setRequestValue(ASN1OctetString requestValue)
{
- assert debugEnter(CLASS_NAME, "setRequestValue",
- String.valueOf(requestValue));
this.requestValue = requestValue;
}
@@ -217,7 +200,6 @@
*/
public final String getResponseOID()
{
- assert debugEnter(CLASS_NAME, "getResponseOID");
return responseOID;
}
@@ -232,8 +214,6 @@
*/
public final void setResponseOID(String responseOID)
{
- assert debugEnter(CLASS_NAME, "setResponseOID",
- String.valueOf(responseOID));
this.responseOID = responseOID;
}
@@ -248,7 +228,6 @@
*/
public final ASN1OctetString getResponseValue()
{
- assert debugEnter(CLASS_NAME, "getResponseValue");
return responseValue;
}
@@ -263,8 +242,6 @@
*/
public final void setResponseValue(ASN1OctetString responseValue)
{
- assert debugEnter(CLASS_NAME, "setResponseValue",
- String.valueOf(responseValue));
this.responseValue = responseValue;
}
@@ -277,7 +254,6 @@
@Override()
public final long getProcessingStartTime()
{
- assert debugEnter(CLASS_NAME, "getProcessingStartTime");
return processingStartTime;
}
@@ -290,7 +266,6 @@
@Override()
public final long getProcessingStopTime()
{
- assert debugEnter(CLASS_NAME, "getProcessingStopTime");
return processingStopTime;
}
@@ -303,7 +278,6 @@
@Override()
public final long getProcessingTime()
{
- assert debugEnter(CLASS_NAME, "getProcessingTime");
return (processingStopTime - processingStartTime);
}
@@ -436,7 +410,6 @@
@Override()
public final List<Control> getResponseControls()
{
- assert debugEnter(CLASS_NAME, "getResponseControls");
return responseControls;
}
@@ -471,7 +444,6 @@
@Override()
public final void run()
{
- assert debugEnter(CLASS_NAME, "run");
setResultCode(ResultCode.UNDEFINED);
@@ -706,7 +678,6 @@
*/
public final void sendExtendedResponse()
{
- assert debugEnter(CLASS_NAME, "sendExtendedResponse");
if (! responseSent)
{
@@ -725,8 +696,6 @@
*/
public final void setResponseSent()
{
- assert debugEnter(CLASS_NAME, "setResponseSent",
- String.valueOf(responseSent));
this.responseSent = true;
}
@@ -739,7 +708,6 @@
@Override()
public final CancelResult cancel(CancelRequest cancelRequest)
{
- assert debugEnter(CLASS_NAME, "cancel", String.valueOf(cancelRequest));
this.cancelRequest = cancelRequest;
@@ -754,7 +722,10 @@
}
catch (Exception e)
{
- assert debugException(CLASS_NAME, "cancel", e);
+ if (debugEnabled())
+ {
+ debugCought(DebugLogLevel.ERROR, e);
+ }
}
cancelResult = getCancelResult();
@@ -780,7 +751,6 @@
@Override()
public final CancelRequest getCancelRequest()
{
- assert debugEnter(CLASS_NAME, "getCancelRequest");
return cancelRequest;
}
@@ -793,8 +763,6 @@
@Override()
boolean setCancelRequest(CancelRequest cancelRequest)
{
- assert debugEnter(CLASS_NAME, "setCancelRequest",
- String.valueOf(cancelRequest));
this.cancelRequest = cancelRequest;
return true;
@@ -808,7 +776,6 @@
@Override()
public final void toString(StringBuilder buffer)
{
- assert debugEnter(CLASS_NAME, "toString", "java.lang.StringBuilder");
buffer.append("ExtendedOperation(connID=");
buffer.append(clientConnection.getConnectionID());
--
Gitblit v1.10.0