Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: Interrupt the thread in QueuedThreadPoolExecutor. #1276

Merged
merged 3 commits into from
Feb 22, 2021
Merged

Fix: Interrupt the thread in QueuedThreadPoolExecutor. #1276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b65526
Fix: Interrupt the thread in QueuedThreadPoolExecutor.
maciejwalkowiak Feb 19, 2021
4d75333
Changelog.
maciejwalkowiak Feb 19, 2021
cc8a72b
Merge branch 'main' into interrupt-executor
marandaneto Feb 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
* Enchancement: Simplify Sentry configuration in Spring integration (#1259)
* Fix: Fix SentryTransaction#getStatus NPE (#1273)
* Enchancement: Optimize SentryTracingFilter when hub is disabled.
* Fix: Interrupt the thread in QueuedThreadPoolExecutor (#1276)
* Fix: SentryTransaction#finish should not clear another transaction from the scope (#1278)

Breaking Changes:
Expand Down
1 change: 1 addition & 0 deletions sentry/src/main/java/io/sentry/transport/QueuedThreadPoolExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}

Expand Down