diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-08-09 09:09:33 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-08-09 09:09:33 -0700 |
| commit | acad79f0c87dd1855020c39238a12476c904da51 (patch) | |
| tree | 54317c576effa957702eb99670c80fbf1effb1fe /src/core/ext/transport | |
| parent | 4103a1b0f2e70ac6eee07f87f35c6b9c0a8562d1 (diff) | |
| parent | 3e104bbe5ccba7a5c4fd30be598da32074ea95aa (diff) | |
Merge github.com:grpc/grpc into grand-unified-closures
Diffstat (limited to 'src/core/ext/transport')
| -rw-r--r-- | src/core/ext/transport/chttp2/transport/chttp2_transport.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.c b/src/core/ext/transport/chttp2/transport/chttp2_transport.c index c5e8f2f6d1..97fe2d8fe0 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.c +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.c @@ -802,6 +802,8 @@ static void push_setting(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t, } } +/* error may be GRPC_ERROR_NONE if there is no error allocated yet. + In that case, use "reason" as the text for a new error. */ static void end_waiting_for_write(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t, grpc_error *error) { grpc_chttp2_stream_global *stream_global; @@ -826,7 +828,7 @@ static void terminate_writing_with_lock(grpc_exec_ctx *exec_ctx, void *tp, grpc_chttp2_cleanup_writing(exec_ctx, &t->global, &t->writing); - end_waiting_for_write(exec_ctx, t, GRPC_ERROR_REF(error)); + end_waiting_for_write(exec_ctx, t, error); switch (t->executor.write_state) { case GRPC_CHTTP2_WRITES_CORKED: |