diff options
| author |  Michael Lumish <mlumish@google.com> | 2017-03-10 09:41:09 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-03-10 09:41:09 -0800 |
| commit | a85e7d4a642da0160e711907b711c1b5eb72eeec (patch) | |
| tree | 61eabb4ba4f414427fcfeb1fd84eee04dfce3a8e /src/core/ext/transport/chttp2 | |
| parent | 97129b0683d83f67aa85295893fbfe7a25c71d42 (diff) | |
| parent | d0cda5c40b08c9b4db394fc253b830be59c3b7b9 (diff) | |
Merge pull request #10054 from murgatroid99/uv_resolver_fallback
Add uv resolver fallback for named ports, fix portability tests
Diffstat (limited to 'src/core/ext/transport/chttp2')
| -rw-r--r-- | src/core/ext/transport/chttp2/transport/chttp2_transport.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.c b/src/core/ext/transport/chttp2/transport/chttp2_transport.c index da4c7dc7b2..a3684535ff 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.c +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.c @@ -511,6 +511,10 @@ static void close_transport_locked(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t, grpc_error *error) { if (!t->closed) { + if (!grpc_error_has_clear_grpc_status(error)) { + error = grpc_error_set_int(error, GRPC_ERROR_INT_GRPC_STATUS, + GRPC_STATUS_UNAVAILABLE); + } if (t->write_state != GRPC_CHTTP2_WRITE_STATE_IDLE) { if (t->close_transport_on_writes_finished == NULL) { t->close_transport_on_writes_finished = @@ -520,10 +524,6 @@ static void close_transport_locked(grpc_exec_ctx *exec_ctx, grpc_error_add_child(t->close_transport_on_writes_finished, error); return; } - if (!grpc_error_has_clear_grpc_status(error)) { - error = grpc_error_set_int(error, GRPC_ERROR_INT_GRPC_STATUS, - GRPC_STATUS_UNAVAILABLE); - } t->closed = 1; connectivity_state_set(exec_ctx, t, GRPC_CHANNEL_SHUTDOWN, GRPC_ERROR_REF(error), "close_transport"); |