1 files changed, 6 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/messaging/amqp/ConnectionHandle.cpp b/qpid/cpp/src/qpid/messaging/amqp/ConnectionHandle.cpp
index 90227fa29b..e34e0a5874 100644
--- a/qpid/cpp/src/qpid/messaging/amqp/ConnectionHandle.cpp
+++ b/qpid/cpp/src/qpid/messaging/amqp/ConnectionHandle.cpp
@@ -21,6 +21,7 @@
 #include "ConnectionHandle.h"
 #include "ConnectionContext.h"
 #include "SessionHandle.h"
+#include "DriverImpl.h"
 #include "qpid/messaging/Session.h"
 #include "qpid/messaging/ProtocolRegistry.h"
 
@@ -40,11 +41,15 @@ ConnectionImpl* create(const std::string& u, const qpid::types::Variant::Map& o)
     }
 }
 
+void shutdown() {
+    DriverImpl::getDefault()->stop();
+}
+
 struct StaticInit
 {
     StaticInit()
     {
-        ProtocolRegistry::add("amqp1.0", &create);
+        ProtocolRegistry::add("amqp1.0", &create, &shutdown);
     };
 } init;
 }