You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by jr...@apache.org on 2018/03/14 20:50:41 UTC
[07/14] qpid-cpp git commit: QPID-7051: Fix crash after reconnect with transactional session. This is a patch from Håkan Johansson
QPID-7051: Fix crash after reconnect with transactional session. This is a patch from Håkan Johansson
Project: http://git-wip-us.apache.org/repos/asf/qpid-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-cpp/commit/2fda1139
Tree: http://git-wip-us.apache.org/repos/asf/qpid-cpp/tree/2fda1139
Diff: http://git-wip-us.apache.org/repos/asf/qpid-cpp/diff/2fda1139
Branch: refs/heads/master
Commit: 2fda1139ae93018d4a3c2bd5571c02512ad7ebe8
Parents: b569b4d
Author: Justin Ross <jr...@apache.org>
Authored: Mon Mar 12 13:15:04 2018 -0700
Committer: Justin Ross <jr...@apache.org>
Committed: Wed Mar 14 10:46:27 2018 -0700
----------------------------------------------------------------------
src/qpid/messaging/amqp/ConnectionContext.cpp | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-cpp/blob/2fda1139/src/qpid/messaging/amqp/ConnectionContext.cpp
----------------------------------------------------------------------
diff --git a/src/qpid/messaging/amqp/ConnectionContext.cpp b/src/qpid/messaging/amqp/ConnectionContext.cpp
index 85408de..097e8f8 100644
--- a/src/qpid/messaging/amqp/ConnectionContext.cpp
+++ b/src/qpid/messaging/amqp/ConnectionContext.cpp
@@ -207,7 +207,12 @@ void ConnectionContext::close()
syncLH(i->second, l);
} catch (const MessageRejected& e) {
QPID_LOG(error, "Could not sync session on connection close due to message rejection (use explicit sync to handle exception): " << e.what());
+ } catch (const SessionClosed& e) {
+ continue;
+ } catch (const TransactionAborted& e) {
+ continue;
}
+
if (!(pn_session_state(i->second->session) & PN_LOCAL_CLOSED)) {
pn_session_close(i->second->session);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org