diff options
| author | Alan Conway <aconway@apache.org> | 2015-02-26 18:23:34 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2015-02-26 18:23:34 +0000 |
| commit | 178b0377a1e78390eedc29d0d2043bb4d230599b (patch) | |
| tree | d1b69621dbe834cc82e76cbce1cd3e5c554b2183 | |
| parent | a1c0a42fcbf247597778c7f6bfbc2a2775bfd75f (diff) | |
| download | qpid-python-178b0377a1e78390eedc29d0d2043bb4d230599b.tar.gz | |
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/trunk@1662526 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/cpp/src/qpid/broker/amqp/Connection.cpp | 2 | ||||
| -rw-r--r-- | 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 |