commit 77d461aaa92e9772cf4203a70219b4e847dc6f50
author Alex Rudyy <orudyy@apache.org> Thu Sep 06 17:35:11 2018 +0100
committer Alex Rudyy <orudyy@apache.org> Wed Sep 19 12:47:08 2018 +0100
tree e0470a488fa0d8821c54e9f2a2b7328d380ed371
parent aaf575fcdbcd021ff4865e920159363df1ddb168

QPID-8243: Optimize Logback1027 turbo filter

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 @@
                               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 @@
         {
             return false;
         }
+
+        if (seen == null)
+        {
+            seen = Collections.newSetFromMap(new IdentityHashMap<Throwable, Boolean>());
+        }
+
         if (!seen.add(t))
         {
             return true;