From 7b655269bb7b35de2799b5ed46b175d5e2b40202 Mon Sep 17 00:00:00 2001 From: Maciej Walkowiak Date: Fri, 19 Feb 2021 10:40:32 +0100 Subject: [PATCH 1/2] Fix: Interrupt the thread in QueuedThreadPoolExecutor. --- .../main/java/io/sentry/transport/QueuedThreadPoolExecutor.java | 1 + 1 file changed, 1 insertion(+) diff --git a/sentry/src/main/java/io/sentry/transport/QueuedThreadPoolExecutor.java b/sentry/src/main/java/io/sentry/transport/QueuedThreadPoolExecutor.java index 5b6651b7ae4..df8cef6b3dc 100644 --- a/sentry/src/main/java/io/sentry/transport/QueuedThreadPoolExecutor.java +++ b/sentry/src/main/java/io/sentry/transport/QueuedThreadPoolExecutor.java @@ -80,6 +80,7 @@ void waitTillIdle(final long timeoutMillis) { unfinishedTasksCount.waitTillZero(timeoutMillis, TimeUnit.MILLISECONDS); } catch (InterruptedException e) { logger.log(SentryLevel.ERROR, "Failed to wait till idle", e); + Thread.currentThread().interrupt(); } } From 4d75333fcbc39f355f926e389b5c9d7121aadbe7 Mon Sep 17 00:00:00 2001 From: Maciej Walkowiak Date: Fri, 19 Feb 2021 10:42:11 +0100 Subject: [PATCH 2/2] Changelog. --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 044e94dcdbb..f858ee98610 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ * Enchancement: Integration interface better compatibility with Kotlin null-safety * Enchancement: Simplify Sentry configuration in Spring integration (#1259) * Enchancement: Optimize SentryTracingFilter when hub is disabled. +* Fix: Interrupt the thread in QueuedThreadPoolExecutor (#1276) Breaking Changes: * Enchancement: SentryExceptionResolver should not send handled errors by default (#1248).