Revert "QPID-8238: turbo filter optimistation"
This reverts commit c30e8aeb66dc98e2e23c09568c3f3770e1dc0d22.
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 105b2e3..9787fbb 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,7 +43,11 @@
final Object[] params,
final Throwable t)
{
- if (t != null && hasRecursiveThrowableReference(t, null))
+
+ Set<Throwable> seen = Collections.newSetFromMap(new IdentityHashMap<Throwable, Boolean>());
+
+
+ if (t != null && hasRecursiveThrowableReference(t, seen))
{
final int locationAwareLoggerInteger = Level.toLocationAwareLoggerInteger(level);
logger.log(marker, logger.getName(), locationAwareLoggerInteger, format, params, new StringifiedException(t));
@@ -59,12 +63,6 @@
{
return false;
}
-
- if (seen == null)
- {
- seen = Collections.newSetFromMap(new IdentityHashMap<Throwable, Boolean>());
- }
-
if (!seen.add(t))
{
return true;
