diff options
| author |  Sree Kuchibhotla <sreek@google.com> | 2018-08-06 14:40:04 -0700 |
|---|---|---|
| committer | Sree Kuchibhotla <sreek@google.com> | 2018-08-06 14:40:04 -0700 |
| commit | 82f0275998ee7b18f806514d4bad48b191d0ca53 (patch) | |
| tree | c25fe954c249baeb8875b6e605a0a3923946516d /src | |
| parent | a2a64e5ad352b7a9760b04ee02facfcf287c0d60 (diff) | |
| parent | b85df0712a0a3a88dddbcd5526be2784461deb9e (diff) | |
Merge branch 'master' into rq-threads-2
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/ext/transport/chttp2/transport/chttp2_transport.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc index bd6fec6fbe..9ad271753c 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc @@ -1208,7 +1208,7 @@ void grpc_chttp2_complete_closure_step(grpc_chttp2_transport* t, grpc_error_add_child(closure->error_data.error, error); } if (closure->next_data.scratch < CLOSURE_BARRIER_FIRST_REF_BIT) { - if (s->seen_error || (t->write_state == GRPC_CHTTP2_WRITE_STATE_IDLE) || + if ((t->write_state == GRPC_CHTTP2_WRITE_STATE_IDLE) || !(closure->next_data.scratch & CLOSURE_BARRIER_MAY_COVER_WRITE)) { GRPC_CLOSURE_RUN(closure, closure->error_data.error); } else { |