You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ch...@apache.org on 2013/04/02 19:57:00 UTC
svn commit: r1463649 - /qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp
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: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
request for inclusion in 0.22 - autodelete queue quota accounting
fix
Posted by Chuck Rolke <cr...@redhat.com>.
----- Forwarded Message -----
> From: chug@apache.org
> To: commits@qpid.apache.org
> Sent: Tuesday, April 2, 2013 1:57:00 PM
> Subject: svn commit: r1463649 - /qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp
>
> 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: commits-unsubscribe@qpid.apache.org
> For additional commands, e-mail: commits-help@qpid.apache.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@qpid.apache.org
For additional commands, e-mail: dev-help@qpid.apache.org