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/SSLConnectionFactory.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/SSLConnectionFactory.java b/opends/src/server/org/opends/server/tools/SSLConnectionFactory.java
index dac928f..146c6be 100644
--- a/opends/src/server/org/opends/server/tools/SSLConnectionFactory.java
+++ b/opends/src/server/org/opends/server/tools/SSLConnectionFactory.java
@@ -45,8 +45,8 @@
import static org.opends.server.messages.ToolMessages.*;
import static org.opends.server.messages.MessageHandler.*;
-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 org.opends.server.types.DebugLogLevel;
@@ -55,6 +55,11 @@
*/
public class SSLConnectionFactory
{
+ /**
+ * The tracer object for the debug logger.
+ */
+ private static final DebugTracer TRACER = getTracer();
+
private SSLSocketFactory sslSocketFactory = null;
@@ -247,7 +252,7 @@
{
if (debugEnabled())
{
- debugCaught(DebugLogLevel.ERROR, e);
+ TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
int msgID = MSGID_TOOLS_CANNOT_LOAD_KEYSTORE_FILE;
throw new SSLConnectionException(getMessage(msgID, keyStoreFile), e);
@@ -265,7 +270,7 @@
{
if (debugEnabled())
{
- debugCaught(DebugLogLevel.ERROR, ke);
+ TRACER.debugCaught(DebugLogLevel.ERROR, ke);
}
int msgID = MSGID_TOOLS_CANNOT_INIT_KEYMANAGER;
throw new SSLConnectionException(getMessage(msgID, keyStoreFile), ke);
@@ -339,7 +344,7 @@
{
if (debugEnabled())
{
- debugCaught(DebugLogLevel.ERROR, e);
+ TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
int msgID = MSGID_TOOLS_CANNOT_LOAD_TRUSTSTORE_FILE;
throw new SSLConnectionException(getMessage(msgID, trustStoreFile), e);
@@ -357,7 +362,7 @@
{
if (debugEnabled())
{
- debugCaught(DebugLogLevel.ERROR, ke);
+ TRACER.debugCaught(DebugLogLevel.ERROR, ke);
}
int msgID = MSGID_TOOLS_CANNOT_INIT_TRUSTMANAGER;
throw new SSLConnectionException(getMessage(msgID, trustStoreFile), ke);
--
Gitblit v1.10.0