qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject svn commit: r1512396 - in /qpid/branches/0.24/qpid: ./ cpp/src/ cpp/src/qpid/broker/ cpp/src/qpid/broker/amqp/Session.cpp
Date Fri, 09 Aug 2013 17:03:17 GMT
Author: gsim
Date: Fri Aug  9 17:03:16 2013
New Revision: 1512396

URL: http://svn.apache.org/r1512396
Log:
QPID-5053: release exclusive queue ownership when session ends (merged from r1512283)

Modified:
    qpid/branches/0.24/qpid/   (props changed)
    qpid/branches/0.24/qpid/cpp/src/   (props changed)
    qpid/branches/0.24/qpid/cpp/src/qpid/broker/   (props changed)
    qpid/branches/0.24/qpid/cpp/src/qpid/broker/amqp/Session.cpp

Propchange: qpid/branches/0.24/qpid/
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid:r1512283

Propchange: qpid/branches/0.24/qpid/cpp/src/
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/cpp/src:r1512283

Propchange: qpid/branches/0.24/qpid/cpp/src/qpid/broker/
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/cpp/src/qpid/broker:r1512283

Modified: qpid/branches/0.24/qpid/cpp/src/qpid/broker/amqp/Session.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/0.24/qpid/cpp/src/qpid/broker/amqp/Session.cpp?rev=1512396&r1=1512395&r2=1512396&view=diff
==============================================================================
--- qpid/branches/0.24/qpid/cpp/src/qpid/broker/amqp/Session.cpp (original)
+++ qpid/branches/0.24/qpid/cpp/src/qpid/broker/amqp/Session.cpp Fri Aug  9 17:03:16 2013
@@ -503,7 +503,6 @@ bool Session::dispatch()
 
 void Session::close()
 {
-    exclusiveQueues.clear();
     for (OutgoingLinks::iterator i = outgoing.begin(); i != outgoing.end(); ++i) {
         i->second->detached();
     }
@@ -516,6 +515,7 @@ void Session::close()
     for (std::set< boost::shared_ptr<Queue> >::const_iterator i = exclusiveQueues.begin();
i != exclusiveQueues.end(); ++i) {
         (*i)->releaseExclusiveOwnership();
     }
+    exclusiveQueues.clear();
     qpid::sys::Mutex::ScopedLock l(lock);
     deleted = true;
 }



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


Mime
View raw message