Repository navigation
Commit 13ec6c7
fix(android): Don't swallow interrupts while flushing a startup crash (#6568)
* fix(android): Don't swallow interrupts while flushing a startup crash
After a startup crash, SendCachedEnvelopeIntegration blocks the thread that calls Sentry.init
until the cached envelopes are sent. If that thread was interrupted, future.get() cleared the
interrupt and the trailing catch (Throwable) swallowed it, so the caller never saw it. It also
logged that cached events will not be sent, although the task keeps sending them.
Catch InterruptedException next to the timeout, restore the interrupt and continue in the
background.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* changelog
---------
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>1 parent b98d31a commit 13ec6c7
3 files changed
Lines changed: 30 additions & 0 deletions
File tree
- sentry-android-core/src
- main/java/io/sentry/android/core
- test/java/io/sentry/android/core
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
44 | 44 | | |
45 | 45 | | |
46 | 46 | | |
| 47 | + | |
47 | 48 | | |
48 | 49 | | |
49 | 50 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
157 | 157 | | |
158 | 158 | | |
159 | 159 | | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
160 | 167 | | |
161 | 168 | | |
162 | 169 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
| 3 | + | |
3 | 4 | | |
4 | 5 | | |
5 | 6 | | |
| |||
137 | 138 | | |
138 | 139 | | |
139 | 140 | | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
140 | 162 | | |
141 | 163 | | |
142 | 164 | | |
| |||
0 commit comments