From 999cbfbe59a6e57b8828a45457d1e8edcbae1f50 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Thu, 26 Feb 2015 21:56:10 +0000 Subject: QPID-6415: Core dump in ha_tests and interlink_tests with proton 0.9 (missed) With proton 0.9 you need call pn_connectin_free before pn_transport_free. Missed 2 cases in the previous commit. git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.32@1662581 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/qpid/broker/amqp/Connection.cpp | 2 +- qpid/cpp/src/qpid/messaging/amqp/ConnectionContext.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qpid/cpp/src/qpid/broker/amqp/Connection.cpp b/qpid/cpp/src/qpid/broker/amqp/Connection.cpp index 8d6516edee..e315e55843 100644 --- a/qpid/cpp/src/qpid/broker/amqp/Connection.cpp +++ b/qpid/cpp/src/qpid/broker/amqp/Connection.cpp @@ -165,8 +165,8 @@ Connection::~Connection() { if (ticker) ticker->cancel(); getBroker().getConnectionObservers().closed(*this); - pn_transport_free(transport); pn_connection_free(connection); + pn_transport_free(transport); #ifdef HAVE_PROTON_EVENTS pn_collector_free(collector); #endif diff --git a/qpid/cpp/src/qpid/messaging/amqp/ConnectionContext.cpp b/qpid/cpp/src/qpid/messaging/amqp/ConnectionContext.cpp index 6630ea2e0d..c974f6c5c1 100644 --- a/qpid/cpp/src/qpid/messaging/amqp/ConnectionContext.cpp +++ b/qpid/cpp/src/qpid/messaging/amqp/ConnectionContext.cpp @@ -151,8 +151,8 @@ ConnectionContext::~ConnectionContext() if (ticker) ticker->cancel(); close(); sessions.clear(); - pn_transport_free(engine); pn_connection_free(connection); + pn_transport_free(engine); } bool ConnectionContext::isOpen() const -- cgit v1.2.1