aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2017-01-06 15:27:31 -0800
committerGravatar Craig Tiller <ctiller@google.com>2017-01-06 15:27:31 -0800
commitf927ad152b23bc6b469140e92bb2f9cb56d5541f (patch)
treee53544618e7bc39edced5d9ee087cee1dae3903c
parentde2508b1da57a74f6304db5b40de8b6e79c5fc74 (diff)
Fix merge errors
-rw-r--r--src/core/lib/surface/call.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/lib/surface/call.c b/src/core/lib/surface/call.c
index f5bac0779c..f53e940fde 100644
--- a/src/core/lib/surface/call.c
+++ b/src/core/lib/surface/call.c
@@ -991,6 +991,9 @@ static void post_batch_completion(grpc_exec_ctx *exec_ctx,
exec_ctx,
&call->metadata_batch[0 /* is_receiving */][0 /* is_trailing */]);
}
+ if (bctl->send_message) {
+ call->sending_message = false;
+ }
if (bctl->send_final_op) {
grpc_metadata_batch_destroy(
exec_ctx,