diff options
| author | Kim van der Riet <kpvdr@apache.org> | 2010-04-13 17:28:52 +0000 |
|---|---|---|
| committer | Kim van der Riet <kpvdr@apache.org> | 2010-04-13 17:28:52 +0000 |
| commit | a41bff40eb9080aa99a06b5325d47d995079d5a0 (patch) | |
| tree | 6646955f9949fd0d4b8a7ab851005d1fea7cc427 /cpp/src/qpid/broker/QueuePolicy.cpp | |
| parent | 118c4bb7fa781bbb4512a66ba1ca618e70abe64b (diff) | |
| download | qpid-python-a41bff40eb9080aa99a06b5325d47d995079d5a0.tar.gz | |
Fix for QPID-2470 - Broker does not honour flow-to-disk policy on recovery
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@933711 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/broker/QueuePolicy.cpp')
| -rw-r--r-- | cpp/src/qpid/broker/QueuePolicy.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cpp/src/qpid/broker/QueuePolicy.cpp b/cpp/src/qpid/broker/QueuePolicy.cpp index a8aa674c53..c8feaa8a62 100644 --- a/cpp/src/qpid/broker/QueuePolicy.cpp +++ b/cpp/src/qpid/broker/QueuePolicy.cpp @@ -29,7 +29,9 @@ using namespace qpid::broker; using namespace qpid::framing; QueuePolicy::QueuePolicy(const std::string& _name, uint32_t _maxCount, uint64_t _maxSize, const std::string& _type) : - maxCount(_maxCount), maxSize(_maxSize), type(_type), count(0), size(0), policyExceeded(false), name(_name) {} + maxCount(_maxCount), maxSize(_maxSize), type(_type), count(0), size(0), policyExceeded(false), name(_name) { + QPID_LOG(info, "Queue \"" << name << "\": Policy created: type=" << type << "; maxCount=" << maxCount << "; maxSize=" << maxSize); +} void QueuePolicy::enqueued(uint64_t _size) { @@ -86,7 +88,7 @@ void QueuePolicy::tryEnqueue(boost::intrusive_ptr<Message> m) void QueuePolicy::recoverEnqueued(boost::intrusive_ptr<Message> m) { - enqueued(m->contentSize()); + tryEnqueue(m); } void QueuePolicy::enqueueAborted(boost::intrusive_ptr<Message> m) |