From 6b67c025160e2363052820b9f686bbf386d9c96a Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Thu, 27 Nov 2008 12:21:04 +0000 Subject: * QPID-1488: test that policy pointer is set * don't flow to disk for null store implementation * add checks for undeflow in queue policy git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@721166 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/broker/MessageBuilder.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'cpp/src/qpid/broker/MessageBuilder.cpp') diff --git a/cpp/src/qpid/broker/MessageBuilder.cpp b/cpp/src/qpid/broker/MessageBuilder.cpp index eda71ed3da..8f0e3344d5 100644 --- a/cpp/src/qpid/broker/MessageBuilder.cpp +++ b/cpp/src/qpid/broker/MessageBuilder.cpp @@ -22,6 +22,7 @@ #include "Message.h" #include "MessageStore.h" +#include "NullMessageStore.h" #include "qpid/framing/AMQFrame.h" #include "qpid/framing/reply_exceptions.h" @@ -72,7 +73,11 @@ void MessageBuilder::handle(AMQFrame& frame) } else { message->getFrames().append(frame); //have we reached the staging limit? if so stage message and release content - if (state == CONTENT && stagingThreshold && message->getFrames().getContentSize() >= stagingThreshold) { + if (state == CONTENT + && stagingThreshold + && message->getFrames().getContentSize() >= stagingThreshold + && !NullMessageStore::isNullStore(store)) + { message->releaseContent(store); staging = true; } -- cgit v1.2.1