From 9a0435e83ef7c986991e31e756c9a195391c4ca1 Mon Sep 17 00:00:00 2001
From: "Mark D. Roth" <roth@google.com>
Date: Tue, 18 Aug 2020 10:33:26 -0700
Subject: [PATCH] Destroy health check service before destroying C server.

---
 src/cpp/server/server_cc.cc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/cpp/server/server_cc.cc b/src/cpp/server/server_cc.cc
index c9aa49c44f6..1228b0f287e 100644
--- a/src/cpp/server/server_cc.cc
+++ b/src/cpp/server/server_cc.cc
@@ -981,7 +981,10 @@ Server::~Server() {
       }
     }
   }
-
+  // Destroy health check service before we destroy the C server so that
+  // it does not call grpc_server_request_registered_call() after the C
+  // server has been destroyed.
+  health_check_service_.reset();
   grpc_server_destroy(server_);
 }