diff options
| author | Gordon Sim <gsim@apache.org> | 2013-10-22 10:43:26 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2013-10-22 10:43:26 +0000 |
| commit | 1535edd46868beb272e261afd7e925640c01445f (patch) | |
| tree | 99c1555afe73ad919a7d2541c0e34588d5175533 | |
| parent | 72f9c62b4d2186fcc64eae4401544d9d3ee43fd7 (diff) | |
| download | qpid-python-1535edd46868beb272e261afd7e925640c01445f.tar.gz | |
QPID-5248: cleanup subscription queue if needed on explicit detach
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1534594 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/cpp/src/qpid/broker/amqp/Outgoing.cpp | 6 | ||||
| -rw-r--r-- | qpid/cpp/src/qpid/broker/amqp/Outgoing.h | 1 | ||||
| -rw-r--r-- | qpid/cpp/src/qpid/broker/amqp/Session.cpp | 2 |
3 files changed, 9 insertions, 0 deletions
diff --git a/qpid/cpp/src/qpid/broker/amqp/Outgoing.cpp b/qpid/cpp/src/qpid/broker/amqp/Outgoing.cpp index 1b7a47b360..7a0bc6c0d8 100644 --- a/qpid/cpp/src/qpid/broker/amqp/Outgoing.cpp +++ b/qpid/cpp/src/qpid/broker/amqp/Outgoing.cpp @@ -300,6 +300,12 @@ size_t OutgoingFromQueue::Record::getIndex(pn_delivery_tag_t t) return (size_t) buffer.getLong(); } +boost::shared_ptr<Queue> OutgoingFromQueue::getExclusiveSubscriptionQueue(Outgoing* o) +{ + OutgoingFromQueue* s = dynamic_cast<OutgoingFromQueue*>(o); + if (s && s->exclusive) return s->queue; + else return boost::shared_ptr<Queue>(); +} }}} // namespace qpid::broker::amqp diff --git a/qpid/cpp/src/qpid/broker/amqp/Outgoing.h b/qpid/cpp/src/qpid/broker/amqp/Outgoing.h index 81994f2b66..48f041171c 100644 --- a/qpid/cpp/src/qpid/broker/amqp/Outgoing.h +++ b/qpid/cpp/src/qpid/broker/amqp/Outgoing.h @@ -107,6 +107,7 @@ class OutgoingFromQueue : public Outgoing, public qpid::broker::Consumer, public void cancel(); void acknowledged(const qpid::broker::DeliveryRecord&); qpid::broker::OwnershipToken* getSession(); + static boost::shared_ptr<Queue> getExclusiveSubscriptionQueue(Outgoing*); private: diff --git a/qpid/cpp/src/qpid/broker/amqp/Session.cpp b/qpid/cpp/src/qpid/broker/amqp/Session.cpp index 7b20dcbe33..9203ce17e4 100644 --- a/qpid/cpp/src/qpid/broker/amqp/Session.cpp +++ b/qpid/cpp/src/qpid/broker/amqp/Session.cpp @@ -475,6 +475,8 @@ void Session::detach(pn_link_t* link) OutgoingLinks::iterator i = outgoing.find(link); if (i != outgoing.end()) { i->second->detached(); + boost::shared_ptr<Queue> q = OutgoingFromQueue::getExclusiveSubscriptionQueue(i->second.get()); + if (q) connection.getBroker().deleteQueue(q->getName(), connection.getUserId(), connection.getMgmtId()); outgoing.erase(i); QPID_LOG(debug, "Outgoing link detached"); } |