aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/lib
diff options
context:
space:
mode:
authorGravatar Ken Payson <kpayson@google.com>2018-01-11 20:25:30 -0800
committerGravatar Ken Payson <kpayson@google.com>2018-01-11 20:25:30 -0800
commitb353297b4394a6c5fadd04ce778bed480d6d5782 (patch)
treea5d5e905c9c6299e03412e0a18166b0a89a4dbc0 /src/core/lib
parent7f2eb4bd41d68da0d249299419ec7c1db35f8123 (diff)
Revert "Revert "Set error status correctly on server side""
Diffstat (limited to 'src/core/lib')
-rw-r--r--src/core/lib/surface/call.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/lib/surface/call.cc b/src/core/lib/surface/call.cc
index a457aaa7a2..d677576c14 100644
--- a/src/core/lib/surface/call.cc
+++ b/src/core/lib/surface/call.cc
@@ -1851,8 +1851,9 @@ static grpc_call_error call_start_batch(grpc_call* call, const grpc_op* ops,
{
grpc_error* override_error = GRPC_ERROR_NONE;
if (op->data.send_status_from_server.status != GRPC_STATUS_OK) {
- override_error = GRPC_ERROR_CREATE_FROM_STATIC_STRING(
- "Error from server send status");
+ override_error =
+ error_from_status(op->data.send_status_from_server.status,
+ "Returned non-ok status");
}
if (op->data.send_status_from_server.status_details != nullptr) {
call->send_extra_metadata[1].md = grpc_mdelem_from_slices(