commit b426828593ca61c07a2bd12c63f4558c11e9f326
author Timothy Bish <tabish121@gmail.com> Fri Feb 13 11:01:32 2015 -0500
committer Timothy Bish <tabish121@gmail.com> Fri Feb 13 11:05:00 2015 -0500
tree 6a68780728b019ddf8545177956f7d307218b35c
parent b8d5e03b0072ccdaecb3bb6bfe654b14174b65b4

https://issues.apache.org/jira/browse/AMQCPP-534

Ensure valid callback reference always set.

activemq-cpp/src/main/activemq/core/ActiveMQConnection.cpp

diff --git a/activemq-cpp/src/main/activemq/core/ActiveMQConnection.cpp b/activemq-cpp/src/main/activemq/core/ActiveMQConnection.cpp
index 0569f97..1d22152 100644
--- a/activemq-cpp/src/main/activemq/core/ActiveMQConnection.cpp
+++ b/activemq-cpp/src/main/activemq/core/ActiveMQConnection.cpp
@@ -37,6 +37,7 @@
 #include <activemq/util/IdGenerator.h>
 #include <activemq/transport/failover/FailoverTransport.h>
 #include <activemq/transport/ResponseCallback.h>
+#include <activemq/transport/DefaultTransportListener.h>
 
 #include <decaf/lang/Math.h>
 #include <decaf/lang/Boolean.h>
@@ -141,6 +142,7 @@
     public:
 
         static util::IdGenerator CONNECTION_ID_GENERATOR;
+        static DefaultTransportListener DO_NOTHING_TRANSPORT_LISTENER;
 
         Pointer<decaf::util::Properties> properties;
         Pointer<transport::Transport> transport;
@@ -309,6 +311,7 @@
 
     // Static init.
     util::IdGenerator ConnectionConfig::CONNECTION_ID_GENERATOR;
+    DefaultTransportListener ConnectionConfig::DO_NOTHING_TRANSPORT_LISTENER;
 
     class ConnectionErrorRunnable : public Runnable {
     private:
@@ -912,7 +915,7 @@
     try {
 
         // Clear the listener, we don't care about async errors at this point.
-        this->config->transport->setTransportListener(NULL);
+        this->config->transport->setTransportListener(&ConnectionConfig::DO_NOTHING_TRANSPORT_LISTENER);
 
         // Allow the Support class to shutdown its resources, including the Transport.
         bool hasException = false;