From f927ad152b23bc6b469140e92bb2f9cb56d5541f Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Fri, 6 Jan 2017 15:27:31 -0800
Subject: [PATCH] Fix merge errors

---
 src/core/lib/surface/call.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/core/lib/surface/call.c b/src/core/lib/surface/call.c
index f5bac0779c8..f53e940fde0 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,