summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGordon Sim <gsim@apache.org>2015-06-15 15:16:31 +0000
committerGordon Sim <gsim@apache.org>2015-06-15 15:16:31 +0000
commit6bf79ce0d46b171735832594bb7edd11c80bbf03 (patch)
treed42a2fa4e58ccde5ef1377da21a792f59908fcea
parent184c3b8414d8c71fa99f5bc8e0e9ed0cecc1ed8a (diff)
downloadqpid-python-6bf79ce0d46b171735832594bb7edd11c80bbf03.tar.gz
QPID-6392: detach not support until after proton 0.7
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1685594 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/cpp/src/qpid/broker/amqp/Connection.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/qpid/cpp/src/qpid/broker/amqp/Connection.cpp b/qpid/cpp/src/qpid/broker/amqp/Connection.cpp
index 144f55780f..6c946b1375 100644
--- a/qpid/cpp/src/qpid/broker/amqp/Connection.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/Connection.cpp
@@ -586,7 +586,10 @@ void Connection::doLinkRemoteDetach(pn_link_t *link, bool closed)
{
if ((pn_link_state(link) & PN_LOCAL_CLOSED) == 0) {
if (closed) pn_link_close(link);
+ //pn_link_detach was only introduced after 0.7, as was the event interface:
+#ifdef HAVE_PROTON_EVENTS
else pn_link_detach(link);
+#endif
Sessions::iterator session = sessions.find(pn_link_session(link));
if (session == sessions.end()) {
QPID_LOG(error, id << " peer attempted to detach link on unknown session!");