From 06dd04cfd30f3ea1f3e9cb0ad2be079f87e6b7b3 Mon Sep 17 00:00:00 2001
From: Craig Tiller <craig.tiller@gmail.com>
Date: Wed, 2 Dec 2015 15:56:27 -0800
Subject: [PATCH] Further review feedback

---
 src/cpp/server/server.cc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/cpp/server/server.cc b/src/cpp/server/server.cc
index cc52c98b172..377c1ed167e 100644
--- a/src/cpp/server/server.cc
+++ b/src/cpp/server/server.cc
@@ -60,12 +60,10 @@ class DefaultGlobalCallbacks GRPC_FINAL : public Server::GlobalCallbacks {
 static Server::GlobalCallbacks* g_callbacks = nullptr;
 static gpr_once g_once_init_callbacks = GPR_ONCE_INIT;
 
-static void DeleteGlobalCallbacks() { delete g_callbacks; }
-
 static void InitGlobalCallbacks() {
   if (g_callbacks == nullptr) {
-    g_callbacks = new DefaultGlobalCallbacks();
-    atexit(DeleteGlobalCallbacks);
+    static DefaultGlobalCallbacks default_global_callbacks;
+    g_callbacks = &default_global_callbacks;
   }
 }