commit 06dd04cfd30f3ea1f3e9cb0ad2be079f87e6b7b3
author Craig Tiller <craig.tiller@gmail.com> Wed Dec 02 15:56:27 2015 -0800
committer Craig Tiller <craig.tiller@gmail.com> Wed Dec 02 15:56:27 2015 -0800
tree 2e2b1e49d251d6e585f3739c3acd3ec423ca30a1
parent 8352b9e99741bc2eb92144cef2c5fc041d3dce5c

Further review feedback

src/cpp/server/server.cc

diff --git a/src/cpp/server/server.cc b/src/cpp/server/server.cc
index cc52c98..377c1ed 100644
--- a/src/cpp/server/server.cc
+++ b/src/cpp/server/server.cc
@@ -60,12 +60,10 @@
 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;
   }
 }