qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject svn commit: r1535731 - /qpid/trunk/qpid/cpp/src/qpid/broker/amqp/Session.cpp
Date Fri, 25 Oct 2013 13:36:29 GMT
Author: gsim
Date: Fri Oct 25 13:36:29 2013
New Revision: 1535731

URL: http://svn.apache.org/r1535731
Log:
QPID-5248: fix regression caused by previous commit on this issue

Modified:
    qpid/trunk/qpid/cpp/src/qpid/broker/amqp/Session.cpp

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/amqp/Session.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/amqp/Session.cpp?rev=1535731&r1=1535730&r2=1535731&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/amqp/Session.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/amqp/Session.cpp Fri Oct 25 13:36:29 2013
@@ -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");
         }



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message