Author: chug
Date: Tue Apr 2 17:57:00 2013
New Revision: 1463649
URL: http://svn.apache.org/r1463649
Log:
QPID-4692 ACL queue quotas did not count autodelete - patch by Ernie Allen
Modified:
qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp?rev=1463649&r1=1463648&r2=1463649&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp Tue Apr 2 17:57:00 2013
@@ -21,6 +21,7 @@
#include "qpid/broker/Queue.h"
#include "qpid/broker/Broker.h"
+#include "qpid/broker/AclModule.h"
#include "qpid/broker/QueueCursor.h"
#include "qpid/broker/QueueDepth.h"
#include "qpid/broker/QueueSettings.h"
@@ -1170,6 +1171,9 @@ void tryAutoDeleteImpl(Broker& broker, Q
{
if (broker.getQueues().destroyIf(queue->getName(),
boost::bind(boost::mem_fn(&Queue::canAutoDelete), queue))) {
+ if (broker.getAcl())
+ broker.getAcl()->recordDestroyQueue(queue->getName());
+
QPID_LOG_CAT(debug, model, "Auto-delete queue: " << queue->getName()
<< " user:" << userId
<< " rhost:" << connectionId );
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
