activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject activemq-cpp git commit: https://issues.apache.org/jira/browse/AMQCPP-534
Date Fri, 13 Feb 2015 16:01:57 GMT
Repository: activemq-cpp
Updated Branches:
  refs/heads/trunk 78669b739 -> dfaa7a7c8


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

Ensure valid callback reference always set.

Project: http://git-wip-us.apache.org/repos/asf/activemq-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-cpp/commit/dfaa7a7c
Tree: http://git-wip-us.apache.org/repos/asf/activemq-cpp/tree/dfaa7a7c
Diff: http://git-wip-us.apache.org/repos/asf/activemq-cpp/diff/dfaa7a7c

Branch: refs/heads/trunk
Commit: dfaa7a7c80360aec95a16300e4243b4fbe50b7d3
Parents: 78669b7
Author: Timothy Bish <tabish121@gmail.com>
Authored: Fri Feb 13 11:01:32 2015 -0500
Committer: Timothy Bish <tabish121@gmail.com>
Committed: Fri Feb 13 11:01:32 2015 -0500

----------------------------------------------------------------------
 activemq-cpp/src/main/activemq/core/ActiveMQConnection.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/dfaa7a7c/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 7cd9061..914b2c2 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 <activemq/wireformat/openwire/OpenWireFormat.h>
 
 #include <decaf/lang/Math.h>
@@ -145,6 +146,7 @@ namespace core {
     public:
 
         static util::IdGenerator CONNECTION_ID_GENERATOR;
+        static DefaultTransportListener DO_NOTHING_TRANSPORT_LISTENER;
 
         Pointer<decaf::util::Properties> properties;
         Pointer<transport::Transport> transport;
@@ -318,6 +320,7 @@ namespace core {
 
     // Static init.
     util::IdGenerator ConnectionConfig::CONNECTION_ID_GENERATOR;
+    DefaultTransportListener ConnectionConfig::DO_NOTHING_TRANSPORT_LISTENER;
 
     class ConnectionErrorRunnable : public Runnable {
     private:
@@ -908,7 +911,7 @@ void ActiveMQConnection::disconnect(long long lastDeliveredSequenceId)
{
     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;


Mime
View raw message