From eb0b39df3d9304bf1b15a4c294abaad36a173ddc Mon Sep 17 00:00:00 2001
From: Vijay Pai <vpai@google.com>
Date: Wed, 5 Dec 2018 16:04:26 -0800
Subject: Do OnDone as the actual last thing so that the reactor can be reused.

---
 include/grpcpp/impl/codegen/client_callback.h | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'include')

diff --git a/include/grpcpp/impl/codegen/client_callback.h b/include/grpcpp/impl/codegen/client_callback.h
index 4d9579fd6a..ede8ac54ca 100644
--- a/include/grpcpp/impl/codegen/client_callback.h
+++ b/include/grpcpp/impl/codegen/client_callback.h
@@ -255,10 +255,12 @@ class ClientCallbackReaderWriterImpl
 
   void MaybeFinish() {
     if (--callbacks_outstanding_ == 0) {
-      reactor_->OnDone(finish_status_);
+      Status s = std::move(finish_status_);
+      auto* reactor = reactor_;
       auto* call = call_.call();
       this->~ClientCallbackReaderWriterImpl();
       g_core_codegen_interface->grpc_call_unref(call);
+      reactor->OnDone(s);
     }
   }
 
@@ -450,10 +452,12 @@ class ClientCallbackReaderImpl
 
   void MaybeFinish() {
     if (--callbacks_outstanding_ == 0) {
-      reactor_->OnDone(finish_status_);
+      Status s = std::move(finish_status_);
+      auto* reactor = reactor_;
       auto* call = call_.call();
       this->~ClientCallbackReaderImpl();
       g_core_codegen_interface->grpc_call_unref(call);
+      reactor->OnDone(s);
     }
   }
 
@@ -576,10 +580,12 @@ class ClientCallbackWriterImpl
 
   void MaybeFinish() {
     if (--callbacks_outstanding_ == 0) {
-      reactor_->OnDone(finish_status_);
+      Status s = std::move(finish_status_);
+      auto* reactor = reactor_;
       auto* call = call_.call();
       this->~ClientCallbackWriterImpl();
       g_core_codegen_interface->grpc_call_unref(call);
+      reactor->OnDone(s);
     }
   }
 
-- 
cgit v1.2.3