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/replication/server/ServerHandler.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/ServerHandler.java b/opends/src/server/org/opends/server/replication/server/ServerHandler.java
index da70bfe..9a34d92 100644
--- a/opends/src/server/org/opends/server/replication/server/ServerHandler.java
+++ b/opends/src/server/org/opends/server/replication/server/ServerHandler.java
@@ -27,8 +27,8 @@
package org.opends.server.replication.server;
import static org.opends.server.loggers.ErrorLogger.logError;
-import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
-import static org.opends.server.loggers.debug.DebugLogger.debugInfo;
+import static org.opends.server.loggers.debug.DebugLogger.*;
+import org.opends.server.loggers.debug.DebugTracer;
import static org.opends.server.messages.MessageHandler.getMessage;
import static org.opends.server.messages.ReplicationMessages.*;
import static org.opends.server.util.StaticUtils.stackTraceToSingleLineString;
@@ -73,6 +73,11 @@
*/
public class ServerHandler extends MonitorProvider
{
+ /**
+ * The tracer object for the debug logger.
+ */
+ private static final DebugTracer TRACER = getTracer();
+
private short serverId;
private ProtocolSession session;
private final MsgQueue msgQueue = new MsgQueue();
@@ -1285,7 +1290,7 @@
public void process(RoutableMessage msg)
{
if (debugEnabled())
- debugInfo("SH(" + replicationServerId + ") forwards " +
+ TRACER.debugInfo("SH(" + replicationServerId + ") forwards " +
msg + " to " + serverId);
logError(ErrorLogCategory.SYNCHRONIZATION,
@@ -1306,7 +1311,7 @@
public void send(RoutableMessage msg) throws IOException
{
if (debugEnabled())
- debugInfo("SH(" + replicationServerId + ") forwards " +
+ TRACER.debugInfo("SH(" + replicationServerId + ") forwards " +
msg + " to " + serverId);
logError(ErrorLogCategory.SYNCHRONIZATION,
--
Gitblit v1.10.0