From b0a7e3cf4a65ea95c79cf002596428d0aed2e26e Mon Sep 17 00:00:00 2001
From: boli <boli@localhost>
Date: Tue, 22 May 2007 23:30:15 +0000
Subject: [PATCH] Remove the dependence on AspectJ for all non method-entry and method-exit related debug messages. All debug statements will now work w/o weaving enabled. However, method-entry and method-exit debug messages work only with weaving enabled.
---
opends/src/server/org/opends/server/tools/LDAPDelete.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/LDAPDelete.java b/opends/src/server/org/opends/server/tools/LDAPDelete.java
index 9f4d160..58b0787 100644
--- a/opends/src/server/org/opends/server/tools/LDAPDelete.java
+++ b/opends/src/server/org/opends/server/tools/LDAPDelete.java
@@ -58,8 +58,8 @@
import org.opends.server.util.args.IntegerArgument;
import org.opends.server.util.args.StringArgument;
-import static org.opends.server.loggers.debug.DebugLogger.debugCaught;
-import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
+import static org.opends.server.loggers.debug.DebugLogger.*;
+import org.opends.server.loggers.debug.DebugTracer;
import static org.opends.server.messages.MessageHandler.*;
import static org.opends.server.messages.ToolMessages.*;
import static org.opends.server.protocols.ldap.LDAPResultCode.*;
@@ -75,6 +75,11 @@
public class LDAPDelete
{
/**
+ * The tracer object for the debug logger.
+ */
+ private static final DebugTracer TRACER = getTracer();
+
+ /**
* The fully-qualified name of this class.
*/
private static final String CLASS_NAME = "org.opends.server.tools.LDAPDelete";
@@ -197,7 +202,7 @@
{
if (debugEnabled())
{
- debugCaught(DebugLogLevel.ERROR, ae);
+ TRACER.debugCaught(DebugLogLevel.ERROR, ae);
}
if (!deleteOptions.continueOnError())
{
@@ -566,7 +571,7 @@
{
if (debugEnabled())
{
- debugCaught(DebugLogLevel.ERROR, ae);
+ TRACER.debugCaught(DebugLogLevel.ERROR, ae);
}
err.println(wrapText(ae.getMessage(), MAX_LINE_WIDTH));
return 1;
@@ -586,7 +591,7 @@
{
if (debugEnabled())
{
- debugCaught(DebugLogLevel.ERROR, ae);
+ TRACER.debugCaught(DebugLogLevel.ERROR, ae);
}
err.println(wrapText(ae.getMessage(), MAX_LINE_WIDTH));
return 1;
@@ -607,7 +612,7 @@
{
if (debugEnabled())
{
- debugCaught(DebugLogLevel.ERROR, ex);
+ TRACER.debugCaught(DebugLogLevel.ERROR, ex);
}
err.println(wrapText(ex.getMessage(), MAX_LINE_WIDTH));
return 1;
@@ -778,7 +783,7 @@
{
if (debugEnabled())
{
- debugCaught(DebugLogLevel.ERROR, le);
+ TRACER.debugCaught(DebugLogLevel.ERROR, le);
}
LDAPToolUtils.printErrorMessage(err, le.getMessage(), le.getResultCode(),
le.getErrorMessage(), le.getMatchedDN());
@@ -788,7 +793,7 @@
{
if (debugEnabled())
{
- debugCaught(DebugLogLevel.ERROR, lce);
+ TRACER.debugCaught(DebugLogLevel.ERROR, lce);
}
LDAPToolUtils.printErrorMessage(err, lce.getMessage(),
lce.getResultCode(),
@@ -800,7 +805,7 @@
{
if (debugEnabled())
{
- debugCaught(DebugLogLevel.ERROR, e);
+ TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
err.println(wrapText(e.getMessage(), MAX_LINE_WIDTH));
return 1;
--
Gitblit v1.10.0