aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/lib/surface/call.cc
diff options
context:
space:
mode:
authorGravatar David Garcia Quintas <dgq@google.com>2018-01-09 19:27:46 -0800
committerGravatar David Garcia Quintas <dgq@google.com>2018-01-09 19:39:13 -0800
commit70fbe6261376f5e0bf7a9c62f3809730d8c93e3c (patch)
tree99108968a0b2d0cc0ceacda7ac89bd1e97c11610 /src/core/lib/surface/call.cc
parentbaf1ac7af91eab2da6024b05ddb83720d9644b94 (diff)
parent0ea629c61ec70a35075e800bc3f85651f00e746f (diff)
Merge branch 'master' of github.com:grpc/grpc into conn_subchannel
Diffstat (limited to 'src/core/lib/surface/call.cc')
-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(