diff options
| author |  yihuaz <yihuaz@google.com> | 2018-11-13 09:23:59 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-11-13 09:23:59 -0800 |
| commit | ea56b5f61e9fa8b03236f3f3a463603685b1e807 (patch) | |
| tree | 9ba17f53f1a67298cf8d96a3270ff02b73221529 /src/core/tsi/alts/handshaker | |
| parent | f50811442116df92e9af3c77e786401eee7d5c06 (diff) | |
| parent | 99d8216d065bfe9860589d0d71c78214229317a9 (diff) | |
Merge pull request #17148 from yihuazhang/test_branch
Resolve a deadlock caused by invocation of grpc_call_cancel inside of gRPC core
Diffstat (limited to 'src/core/tsi/alts/handshaker')
| -rw-r--r-- | src/core/tsi/alts/handshaker/alts_handshaker_client.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/tsi/alts/handshaker/alts_handshaker_client.cc b/src/core/tsi/alts/handshaker/alts_handshaker_client.cc index 941ca13114..1de6264183 100644 --- a/src/core/tsi/alts/handshaker/alts_handshaker_client.cc +++ b/src/core/tsi/alts/handshaker/alts_handshaker_client.cc @@ -376,7 +376,7 @@ static void handshaker_client_shutdown(alts_handshaker_client* c) { alts_grpc_handshaker_client* client = reinterpret_cast<alts_grpc_handshaker_client*>(c); if (client->call != nullptr) { - GPR_ASSERT(grpc_call_cancel(client->call, nullptr) == GRPC_CALL_OK); + grpc_call_cancel_internal(client->call); } } |