diff options
| author | Gordon Sim <gsim@apache.org> | 2013-10-25 13:36:29 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2013-10-25 13:36:29 +0000 |
| commit | 514b9c7809af5fca6d85b33da98fa5d6741e7488 (patch) | |
| tree | b8346ee32468285a718dea34a677f24e0ec9997c /cpp | |
| parent | 7b1003c23ee8e8de9bc2dc041070f5bd536062dd (diff) | |
| download | qpid-python-514b9c7809af5fca6d85b33da98fa5d6741e7488.tar.gz | |
QPID-5248: fix regression caused by previous commit on this issue
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1535731 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/qpid/broker/amqp/Session.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cpp/src/qpid/broker/amqp/Session.cpp b/cpp/src/qpid/broker/amqp/Session.cpp index 9203ce17e4..006493f01f 100644 --- a/cpp/src/qpid/broker/amqp/Session.cpp +++ b/cpp/src/qpid/broker/amqp/Session.cpp @@ -476,7 +476,9 @@ void Session::detach(pn_link_t* 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()); + if (q && !q->isAutoDelete() && !q->isDeleted()) { + connection.getBroker().deleteQueue(q->getName(), connection.getUserId(), connection.getMgmtId()); + } outgoing.erase(i); QPID_LOG(debug, "Outgoing link detached"); } |