From 28cec947ae43bd3bbc083cad528d52ad235551d4 Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Mon, 2 Apr 2018 11:47:20 -0700
Subject: [PATCH] serverContext: collapse destroyAllTransports() into
 shutdown()

---
 src/server/pv/serverContextImpl.h | 5 -----
 src/server/serverContext.cpp      | 8 +-------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/server/pv/serverContextImpl.h b/src/server/pv/serverContextImpl.h
index 168032f..7e03dcf 100644
--- a/src/server/pv/serverContextImpl.h
+++ b/src/server/pv/serverContextImpl.h
@@ -259,11 +259,6 @@ private:
      */
     void loadConfiguration();
 
-    /**
-     * Destroy all transports.
-     */
-    void destroyAllTransports();
-
     Configuration::const_shared_pointer configuration;
 
     epicsTimeStamp _startTime;
diff --git a/src/server/serverContext.cpp b/src/server/serverContext.cpp
index 3ba9364..3b31c8d 100644
--- a/src/server/serverContext.cpp
+++ b/src/server/serverContext.cpp
@@ -346,7 +346,7 @@ void ServerContextImpl::shutdown()
     }
 
     // this will also destroy all channels
-    destroyAllTransports();
+    _transportRegistry.clear();
 
     // drop timer queue
     LEAK_CHECK(_timer, "_timer")
@@ -360,12 +360,6 @@ void ServerContextImpl::shutdown()
     _runEvent.signal();
 }
 
-void ServerContextImpl::destroyAllTransports()
-{
-    // now clear all (release)
-    _transportRegistry.clear();
-}
-
 void ServerContext::printInfo(int lvl)
 {
     printInfo(cout, lvl);