summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGordon Sim <gsim@apache.org>2011-11-18 21:01:17 +0000
committerGordon Sim <gsim@apache.org>2011-11-18 21:01:17 +0000
commit10a2d3074f254794ae8443994e60b0e4e8c0b56a (patch)
tree35b36f0cc5c1ac2aef6674ff30f13dc9fd8db2e5
parent920a7a6c3ad7e1c84bb8a49ef3409e33e474543b (diff)
downloadqpid-python-10a2d3074f254794ae8443994e60b0e4e8c0b56a.tar.gz
QPID-3180: Further fix to the size checking logic for ring queues
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1203835 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/cpp/src/qpid/broker/QueuePolicy.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/broker/QueuePolicy.cpp b/qpid/cpp/src/qpid/broker/QueuePolicy.cpp
index 0c245700af..dafcf92a63 100644
--- a/qpid/cpp/src/qpid/broker/QueuePolicy.cpp
+++ b/qpid/cpp/src/qpid/broker/QueuePolicy.cpp
@@ -285,7 +285,7 @@ bool RingQueuePolicy::checkLimit(boost::intrusive_ptr<Message> m)
<< ": oldest message (seq-no=" << oldest.position << ") has been delivered but not yet acknowledged or requeued");
return false;
}
- } while (haveSpace < m->contentSize());
+ } while (getMaxSize() && haveSpace < m->contentSize());
return true;