You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2018/09/10 00:11:12 UTC

[6/6] qpid-broker-j git commit: QPID-8238: turbo filter optimistation

QPID-8238: turbo filter optimistation


Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/c30e8aeb
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/c30e8aeb
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/c30e8aeb

Branch: refs/heads/master
Commit: c30e8aeb66dc98e2e23c09568c3f3770e1dc0d22
Parents: 0510ed3
Author: Alex Rudyy <or...@apache.org>
Authored: Thu Sep 6 17:35:11 2018 +0100
Committer: Alex Rudyy <or...@apache.org>
Committed: Mon Sep 10 01:10:55 2018 +0100

----------------------------------------------------------------------
 .../logback/Logback1027WorkaroundTurboFilter.java       | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/c30e8aeb/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/Logback1027WorkaroundTurboFilter.java
----------------------------------------------------------------------
diff --git a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/Logback1027WorkaroundTurboFilter.java b/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/Logback1027WorkaroundTurboFilter.java
index 9787fbb..105b2e3 100644
--- a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/Logback1027WorkaroundTurboFilter.java
+++ b/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/Logback1027WorkaroundTurboFilter.java
@@ -43,11 +43,7 @@ public class Logback1027WorkaroundTurboFilter extends TurboFilter
                               final Object[] params,
                               final Throwable t)
     {
-
-        Set<Throwable> seen = Collections.newSetFromMap(new IdentityHashMap<Throwable, Boolean>());
-
-
-        if (t != null && hasRecursiveThrowableReference(t, seen))
+        if (t != null && hasRecursiveThrowableReference(t, null))
         {
             final int locationAwareLoggerInteger = Level.toLocationAwareLoggerInteger(level);
             logger.log(marker, logger.getName(), locationAwareLoggerInteger, format, params, new StringifiedException(t));
@@ -63,6 +59,12 @@ public class Logback1027WorkaroundTurboFilter extends TurboFilter
         {
             return false;
         }
+
+        if (seen == null)
+        {
+            seen = Collections.newSetFromMap(new IdentityHashMap<Throwable, Boolean>());
+        }
+
         if (!seen.add(t))
         {
             return true;


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org