Commit 4725ced
authored
binder: Avoid potential deadlock when canceling AsyncSecurityPolicy futures (#12283)
Move future cancellation outside of synchronized block in
`BinderClientTransport.notifyTerminated()` to prevent deadlock if
`AsyncSecurityPolicy` uses `directExecutor()` for callbacks.
Fixes #12190
---------
Signed-off-by: Hyunsang Han <gustkd3@gmail.com>1 parent 7f0a19d commit 4725ced
File tree
2 files changed
+24
-15
lines changed- binder/src/main/java/io/grpc/binder/internal
2 files changed
+24
-15
lines changedLines changed: 5 additions & 15 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
87 | 87 | | |
88 | 88 | | |
89 | 89 | | |
90 | | - | |
91 | | - | |
92 | | - | |
93 | | - | |
94 | | - | |
95 | | - | |
96 | | - | |
97 | 90 | | |
98 | 91 | | |
99 | 92 | | |
| |||
193 | 186 | | |
194 | 187 | | |
195 | 188 | | |
196 | | - | |
| 189 | + | |
| 190 | + | |
197 | 191 | | |
198 | 192 | | |
199 | 193 | | |
| |||
314 | 308 | | |
315 | 309 | | |
316 | 310 | | |
317 | | - | |
318 | | - | |
319 | | - | |
320 | | - | |
321 | | - | |
322 | | - | |
323 | 311 | | |
324 | 312 | | |
325 | 313 | | |
| |||
339 | 327 | | |
340 | 328 | | |
341 | 329 | | |
342 | | - | |
| 330 | + | |
| 331 | + | |
343 | 332 | | |
344 | 333 | | |
345 | 334 | | |
| |||
398 | 387 | | |
399 | 388 | | |
400 | 389 | | |
| 390 | + | |
401 | 391 | | |
402 | 392 | | |
403 | 393 | | |
| |||
Lines changed: 19 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
45 | 45 | | |
46 | 46 | | |
47 | 47 | | |
| 48 | + | |
48 | 49 | | |
49 | 50 | | |
50 | 51 | | |
| 52 | + | |
51 | 53 | | |
52 | 54 | | |
53 | 55 | | |
| |||
166 | 168 | | |
167 | 169 | | |
168 | 170 | | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
169 | 174 | | |
170 | 175 | | |
171 | 176 | | |
| |||
249 | 254 | | |
250 | 255 | | |
251 | 256 | | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
| 261 | + | |
| 262 | + | |
| 263 | + | |
252 | 264 | | |
253 | 265 | | |
254 | 266 | | |
| |||
299 | 311 | | |
300 | 312 | | |
301 | 313 | | |
| 314 | + | |
| 315 | + | |
302 | 316 | | |
303 | 317 | | |
304 | 318 | | |
| |||
310 | 324 | | |
311 | 325 | | |
312 | 326 | | |
| 327 | + | |
| 328 | + | |
| 329 | + | |
| 330 | + | |
| 331 | + | |
313 | 332 | | |
314 | 333 | | |
315 | 334 | | |
| |||
0 commit comments