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/core/ConnectionHandlerConfigManager.java | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/ConnectionHandlerConfigManager.java b/opends/src/server/org/opends/server/core/ConnectionHandlerConfigManager.java
index bc4cff5..aaef4f4 100644
--- a/opends/src/server/org/opends/server/core/ConnectionHandlerConfigManager.java
+++ b/opends/src/server/org/opends/server/core/ConnectionHandlerConfigManager.java
@@ -28,8 +28,8 @@
-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.ConfigMessages.*;
import static org.opends.server.messages.CoreMessages.*;
import static org.opends.server.messages.MessageHandler.getMessage;
@@ -68,6 +68,11 @@
ConfigurationAddListener<ConnectionHandlerCfg>,
ConfigurationDeleteListener<ConnectionHandlerCfg>,
ConfigurationChangeListener<ConnectionHandlerCfg> {
+ /**
+ * The tracer object for the debug logger.
+ */
+ private static final DebugTracer TRACER = getTracer();
+
// The mapping between configuration entry DNs and their
// corresponding connection handler implementations.
@@ -118,7 +123,7 @@
} catch (ConfigException e) {
if (debugEnabled())
{
- debugCaught(DebugLogLevel.ERROR, e);
+ TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
messages.add(e.getMessage());
@@ -126,7 +131,7 @@
} catch (Exception e) {
if (debugEnabled())
{
- debugCaught(DebugLogLevel.ERROR, e);
+ TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
int msgID = MSGID_CONFIG_CONNHANDLER_CANNOT_INITIALIZE;
@@ -179,7 +184,7 @@
} catch (ConfigException e) {
if (debugEnabled())
{
- debugCaught(DebugLogLevel.ERROR, e);
+ TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
messages.add(e.getMessage());
@@ -187,7 +192,7 @@
} catch (Exception e) {
if (debugEnabled())
{
- debugCaught(DebugLogLevel.ERROR, e);
+ TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
int msgID = MSGID_CONFIG_CONNHANDLER_CANNOT_INITIALIZE;
@@ -379,7 +384,7 @@
} catch (Exception e) {
if (debugEnabled())
{
- debugCaught(DebugLogLevel.ERROR, e);
+ TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
int msgID = MSGID_CONFIG_CONNHANDLER_CANNOT_INITIALIZE;
@@ -403,7 +408,7 @@
} catch (Exception e) {
if (debugEnabled())
{
- debugCaught(DebugLogLevel.ERROR, e);
+ TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
int msgID = MSGID_CONFIG_CONNHANDLER_CANNOT_INITIALIZE;
@@ -438,7 +443,7 @@
} catch (Exception e) {
if (debugEnabled())
{
- debugCaught(DebugLogLevel.ERROR, e);
+ TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
int msgID = MSGID_CONFIG_CONNHANDLER_CANNOT_INITIALIZE;
@@ -459,7 +464,7 @@
} catch (Exception e) {
if (debugEnabled())
{
- debugCaught(DebugLogLevel.ERROR, e);
+ TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
int msgID = MSGID_CONFIG_CONNHANDLER_CANNOT_INITIALIZE;
--
Gitblit v1.10.0