Make Server::Wait work for async only server.

1 files changed, 2 insertions, 3 deletions

diff --git a/src/cpp/server/server.cc b/src/cpp/server/server.cc
index fb4c68ebe4..374c9cbc04 100644
--- a/src/cpp/server/server.cc
+++ b/src/cpp/server/server.cc
@@ -462,14 +462,13 @@ void Server::ShutdownInternal(gpr_timespec deadline) {
     while (num_running_cb_ != 0) {
       callback_cv_.wait(lock);
     }
+    shutdown_cv_.notify_all();
   }
 }
 
 void Server::Wait() {
   grpc::unique_lock<grpc::mutex> lock(mu_);
-  while (num_running_cb_ != 0) {
-    callback_cv_.wait(lock);
-  }
+  shutdown_cv_.wait(lock);
 }
 
 void Server::PerformOpsOnCall(CallOpSetInterface* ops, Call* call) {