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/extensions/NullConnectionSecurityProvider.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/opends/src/server/org/opends/server/extensions/NullConnectionSecurityProvider.java b/opends/src/server/org/opends/server/extensions/NullConnectionSecurityProvider.java
index 64c0a70..b007350 100644
--- a/opends/src/server/org/opends/server/extensions/NullConnectionSecurityProvider.java
+++ b/opends/src/server/org/opends/server/extensions/NullConnectionSecurityProvider.java
@@ -41,8 +41,8 @@
import org.opends.server.types.InitializationException;
import org.opends.server.types.DebugLogLevel;
-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.ExtensionsMessages.*;
import static org.opends.server.util.StaticUtils.*;
@@ -56,6 +56,11 @@
public class NullConnectionSecurityProvider
extends ConnectionSecurityProvider
{
+ /**
+ * The tracer object for the debug logger.
+ */
+ private static final DebugTracer TRACER = getTracer();
+
@@ -311,7 +316,7 @@
{
if (debugEnabled())
{
- debugCaught(DebugLogLevel.ERROR, ioe);
+ TRACER.debugCaught(DebugLogLevel.ERROR, ioe);
}
// An error occurred while trying to read data from the client.
@@ -323,7 +328,7 @@
{
if (debugEnabled())
{
- debugCaught(DebugLogLevel.ERROR, e);
+ TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
// An unexpected error occurred. Disconnect and return.
@@ -380,7 +385,7 @@
{
if (debugEnabled())
{
- debugCaught(DebugLogLevel.ERROR, ioe);
+ TRACER.debugCaught(DebugLogLevel.ERROR, ioe);
}
// An error occurred while trying to write data to the client. Disconnect
@@ -392,7 +397,7 @@
{
if (debugEnabled())
{
- debugCaught(DebugLogLevel.ERROR, e);
+ TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
// An unexpected error occurred. Disconnect and return.
--
Gitblit v1.10.0