diff options
| author | Charles E. Rolke <chug@apache.org> | 2013-04-02 17:57:00 +0000 |
|---|---|---|
| committer | Charles E. Rolke <chug@apache.org> | 2013-04-02 17:57:00 +0000 |
| commit | 8661cf5bfb4006a023d66dc4baa62670c00ec62a (patch) | |
| tree | b76374735bb1571877a36d0825080e8f76184318 /qpid/cpp/src | |
| parent | 88f4165312120d1b516aea6ad8a70adfbe434207 (diff) | |
| download | qpid-python-8661cf5bfb4006a023d66dc4baa62670c00ec62a.tar.gz | |
QPID-4692 ACL queue quotas did not count autodelete - patch by Ernie Allen
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1463649 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
| -rw-r--r-- | qpid/cpp/src/qpid/broker/Queue.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/qpid/cpp/src/qpid/broker/Queue.cpp b/qpid/cpp/src/qpid/broker/Queue.cpp index 84fab543ec..d5df660539 100644 --- a/qpid/cpp/src/qpid/broker/Queue.cpp +++ b/qpid/cpp/src/qpid/broker/Queue.cpp @@ -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, Queue::shared_ptr queue, const std::strin { 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 ); |