Commit a1ce62b
committed
fix: close the full-capture source best-effort and exactly once
On the full-capture path, drainAndCache() closed the source and only
then set the single-close guard. If that close() threw, the guard was
left unset and control fell into the catch block, which closed the same
source a second time — the double-close the wrapper's guard exists to
prevent (some sockets/streams throw on double-close). The close failure
was also stored as a drainError, so source() then re-threw on every call
and the caller could no longer read the complete body that had already
been buffered.
Close the source as best-effort on this path: swallow a close failure
(mirroring the read-failure handler) and mark the delegate closed whether
or not close() succeeds. A failure to release the handle after a complete
capture is cleanup, not a capture failure, so the buffered body stays
readable, captureException stays null, and the source is closed once.
Add tests for a fully-captured source whose close() throws: the body
remains readable and unpoisoned, and the source is closed exactly once
across the drain and a later wrapper close. Also fold the close-guard
rationale into the closeDelegateOnce KDoc to drop a duplicated comment.1 parent 61e2df7 commit a1ce62b
2 files changed
Lines changed: 89 additions & 10 deletions
File tree
- sdk-core/src
- main/kotlin/org/dexpace/sdk/core/http/response
- test/kotlin/org/dexpace/sdk/core/http/response
Lines changed: 23 additions & 10 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
207 | 207 | | |
208 | 208 | | |
209 | 209 | | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
210 | 215 | | |
211 | 216 | | |
212 | 217 | | |
213 | 218 | | |
214 | | - | |
215 | | - | |
216 | | - | |
217 | | - | |
218 | 219 | | |
219 | 220 | | |
220 | 221 | | |
| |||
242 | 243 | | |
243 | 244 | | |
244 | 245 | | |
245 | | - | |
246 | | - | |
247 | | - | |
248 | | - | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
249 | 251 | | |
250 | 252 | | |
251 | 253 | | |
| |||
278 | 280 | | |
279 | 281 | | |
280 | 282 | | |
281 | | - | |
282 | | - | |
| 283 | + | |
| 284 | + | |
| 285 | + | |
| 286 | + | |
| 287 | + | |
| 288 | + | |
| 289 | + | |
| 290 | + | |
| 291 | + | |
| 292 | + | |
| 293 | + | |
| 294 | + | |
| 295 | + | |
283 | 296 | | |
284 | 297 | | |
285 | 298 | | |
| |||
Lines changed: 66 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
52 | 52 | | |
53 | 53 | | |
54 | 54 | | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
55 | 83 | | |
56 | 84 | | |
57 | 85 | | |
| |||
166 | 194 | | |
167 | 195 | | |
168 | 196 | | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
169 | 235 | | |
170 | 236 | | |
171 | 237 | | |
| |||
0 commit comments