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/ProxiedAuthV2Control.java | 30 +++++++++++-------------------
1 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/opends/src/server/org/opends/server/controls/ProxiedAuthV2Control.java b/opends/src/server/org/opends/server/controls/ProxiedAuthV2Control.java
index 068151e..c8410a1 100644
--- a/opends/src/server/org/opends/server/controls/ProxiedAuthV2Control.java
+++ b/opends/src/server/org/opends/server/controls/ProxiedAuthV2Control.java
@@ -44,7 +44,9 @@
import org.opends.server.types.LockManager;
import org.opends.server.types.ResultCode;
-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.MessageHandler.*;
import static org.opends.server.messages.ProtocolMessages.*;
import static org.opends.server.util.ServerConstants.*;
@@ -64,11 +66,6 @@
public class ProxiedAuthV2Control
extends Control
{
- /**
- * The fully-qualified name of this class for debugging purposes.
- */
- private static final String CLASS_NAME =
- "org.opends.server.controls.ProxiedAuthV2Control";
@@ -87,7 +84,6 @@
{
super(OID_PROXIED_AUTH_V2, true, authorizationID);
- assert debugConstructor(CLASS_NAME, String.valueOf(authorizationID));
ensureNotNull(authorizationID);
this.authorizationID = authorizationID;
@@ -110,9 +106,6 @@
{
super(oid, isCritical, authorizationID);
- assert debugConstructor(CLASS_NAME, String.valueOf(oid),
- String.valueOf(isCritical),
- String.valueOf(authorizationID));
this.authorizationID = authorizationID;
}
@@ -136,7 +129,6 @@
public static ProxiedAuthV2Control decodeControl(Control control)
throws LDAPException
{
- assert debugEnter(CLASS_NAME, "decodeControl", String.valueOf(control));
ensureNotNull(control);
@@ -170,7 +162,10 @@
}
else
{
- assert debugException(CLASS_NAME, "decodeControl", ae);
+ if (debugEnabled())
+ {
+ debugCought(DebugLogLevel.ERROR, ae);
+ }
int msgID = MSGID_PROXYAUTH2_CANNOT_DECODE_VALUE;
String message = getMessage(msgID, stackTraceToSingleLineString(ae));
@@ -180,7 +175,10 @@
}
catch (Exception e)
{
- assert debugException(CLASS_NAME, "decodeControl", e);
+ if (debugEnabled())
+ {
+ debugCought(DebugLogLevel.ERROR, e);
+ }
int msgID = MSGID_PROXYAUTH2_CANNOT_DECODE_VALUE;
String message = getMessage(msgID, stackTraceToSingleLineString(e));
@@ -200,7 +198,6 @@
*/
public ASN1OctetString getAuthorizationID()
{
- assert debugEnter(CLASS_NAME, "getAuthorizationID");
return authorizationID;
}
@@ -215,8 +212,6 @@
*/
public void setAuthorizationID(ASN1OctetString authorizationID)
{
- assert debugEnter(CLASS_NAME, "setAuthorizationID",
- String.valueOf(authorizationID));
if (authorizationID == null)
{
@@ -249,7 +244,6 @@
public Entry getAuthorizationEntry()
throws DirectoryException
{
- assert debugEnter(CLASS_NAME, "getValidatedAuthorizationDN");
// Check for a zero-length value, which would be for an anonymous user.
@@ -405,7 +399,6 @@
*/
public String toString()
{
- assert debugEnter(CLASS_NAME, "toString");
StringBuilder buffer = new StringBuilder();
toString(buffer);
@@ -422,7 +415,6 @@
*/
public void toString(StringBuilder buffer)
{
- assert debugEnter(CLASS_NAME, "toString", "java.lang.StringBuilder");
buffer.append("ProxiedAuthorizationV2Control(authzID=\"");
authorizationID.toString(buffer);
--
Gitblit v1.10.0