From a41bff40eb9080aa99a06b5325d47d995079d5a0 Mon Sep 17 00:00:00 2001 From: Kim van der Riet Date: Tue, 13 Apr 2010 17:28:52 +0000 Subject: 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 --- cpp/src/qpid/broker/SemanticState.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'cpp/src/qpid/broker/SemanticState.cpp') diff --git a/cpp/src/qpid/broker/SemanticState.cpp b/cpp/src/qpid/broker/SemanticState.cpp index 5148d88e72..d4fa465f37 100644 --- a/cpp/src/qpid/broker/SemanticState.cpp +++ b/cpp/src/qpid/broker/SemanticState.cpp @@ -413,8 +413,17 @@ void SemanticState::handle(intrusive_ptr msg) { } else { DeliverableMessage deliverable(msg); route(msg, deliverable); - if (msg->checkContentReleasable()) { - msg->releaseContent(); + if (msg->isContentReleaseRequested()) { + // NOTE: The log messages in this section are used for flow-to-disk testing (which checks the log for the + // presence of these messages). Do not change these without also checking these tests. + if (msg->isContentReleaseBlocked()) { + QPID_LOG(debug, "Message id=\"" << msg->getProperties()->getMessageId() << "\"; pid=0x" << + std::hex << msg->getPersistenceId() << std::dec << ": Content release blocked"); + } else { + msg->releaseContent(); + QPID_LOG(debug, "Message id=\"" << msg->getProperties()->getMessageId() << "\"; pid=0x" << + std::hex << msg->getPersistenceId() << std::dec << ": Content released"); + } } } } -- cgit v1.2.1