From a2376d93e545fff522eaaeba46b85766f8940f1a Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 16 Dec 2015 14:29:42 +0000
Subject: [PATCH] OPENDJ-2547 Creating a debug target for a specific method actually traces messages for the whole class
---
opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugTracer.java | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugTracer.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugTracer.java
index 3054532..65a2cd7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugTracer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugTracer.java
@@ -154,17 +154,11 @@
// If this method does have a specific setting
// and it is not supposed to be logged, continue.
- if (mSettings != null)
+ if (!shouldLog(mSettings, hasException))
{
- if (!shouldLog(mSettings, hasException))
- {
- continue;
- }
- else
- {
- activeSettings = mSettings;
- }
+ continue;
}
+ activeSettings = mSettings;
}
String sourceLocation = callerFrame.getFileName() + ":" + callerFrame.getLineNumber();
@@ -283,8 +277,9 @@
/** Indicates if there is something to log. */
private boolean shouldLog(TraceSettings settings, boolean hasException)
{
- return settings.getLevel() == ALL
- || (hasException && settings.getLevel() == EXCEPTIONS_ONLY);
+ return settings != null
+ && (settings.getLevel() == ALL
+ || (hasException && settings.getLevel() == EXCEPTIONS_ONLY));
}
/** Indicates if there is something to log. */
--
Gitblit v1.10.0