From 36c6fd0e309149de2ede18b7f6f1c11884c8ab13 Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Tue, 30 Sep 2008 18:46:31 +0000 Subject: Handle case where first message in 'ring queue' would exceed limit. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@700545 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/broker/QueuePolicy.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'cpp') diff --git a/cpp/src/qpid/broker/QueuePolicy.cpp b/cpp/src/qpid/broker/QueuePolicy.cpp index c8980b8b4d..aefb87a392 100644 --- a/cpp/src/qpid/broker/QueuePolicy.cpp +++ b/cpp/src/qpid/broker/QueuePolicy.cpp @@ -176,6 +176,13 @@ bool RingQueuePolicy::checkLimit(const QueuedMessage& m) QueuedMessage oldest; { qpid::sys::Mutex::ScopedLock l(lock); + if (queue.empty()) { + QPID_LOG(debug, "Message too large for ring queue " + << (m.queue ? m.queue->getName() : std::string("unknown queue")) + << " [" << *this << "] " + << ": message size = " << m.payload->contentSize() << " bytes"); + return false; + } oldest = queue.front(); } if (oldest.queue->acquire(oldest) || !strict) { -- cgit v1.2.1