diff options
| author |  Mark D. Roth <roth@google.com> | 2016-09-09 07:46:01 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-09-09 07:46:01 -0700 |
| commit | 75d7478d122de8142f9306463058e8d18dfd614a (patch) | |
| tree | b8ed535cfee05780bd984495591858159c8f4117 /src/core/lib/transport | |
| parent | f451d50d4ce1157a014e32faf2ef419eab2b9aea (diff) | |
Fix close vs. cancel confusion in transport helper functions.
Diffstat (limited to 'src/core/lib/transport')
| -rw-r--r-- | src/core/lib/transport/transport.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/core/lib/transport/transport.c b/src/core/lib/transport/transport.c index d4e197fa5c..205a136742 100644 --- a/src/core/lib/transport/transport.c +++ b/src/core/lib/transport/transport.c @@ -220,11 +220,7 @@ void grpc_transport_stream_op_add_cancellation_with_message( error = GRPC_ERROR_CREATE("Call cancelled"); } error = grpc_error_set_int(error, GRPC_ERROR_INT_GRPC_STATUS, status); - // TODO(ctiller): We are intentionally setting close_error instead of - // cancel_error here. This is an ugly hack and should be replaced - // by a more general-purpose mechanism that allows us to control - // cancel/close behavior. - add_error(op, &op->close_error, error); + add_error(op, &op->cancel_error, error); } void grpc_transport_stream_op_add_close(grpc_transport_stream_op *op, |