From 8ade86a93793137b337502faefefcaf0c4a203eb Mon Sep 17 00:00:00 2001
From: "Carl C. Trieloff" <cctrieloff@apache.org>
Date: Fri, 10 Jul 2009 19:42:16 +0000
Subject: Correct the case where for very low ( bytes) staging threshhold
 management could get disabled. Fix prevents the staging of management
 messages + test

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@793091 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/src/qpid/broker/MessageBuilder.cpp |  5 ++++-
 cpp/src/tests/MessageBuilderTest.cpp   | 25 +++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

(limited to 'cpp')

diff --git a/cpp/src/qpid/broker/MessageBuilder.cpp b/cpp/src/qpid/broker/MessageBuilder.cpp
index 1e988021b2..bc8c10d4b1 100644
--- a/cpp/src/qpid/broker/MessageBuilder.cpp
+++ b/cpp/src/qpid/broker/MessageBuilder.cpp
@@ -37,6 +37,8 @@ namespace
 MessageBuilder::MessageBuilder(MessageStore* const _store, uint64_t _stagingThreshold) : 
     state(DORMANT), store(_store), stagingThreshold(_stagingThreshold), staging(false) {}
 
+static const std::string QPID_MANAGEMENT("qpid.management");
+
 void MessageBuilder::handle(AMQFrame& frame)
 {
     uint8_t type = frame.getBody()->type();
@@ -75,7 +77,8 @@ void MessageBuilder::handle(AMQFrame& frame)
         if (state == CONTENT 
             && stagingThreshold 
             && message->getFrames().getContentSize() >= stagingThreshold
-            && !NullMessageStore::isNullStore(store)) 
+            && !NullMessageStore::isNullStore(store)
+            && message->getExchangeName() != QPID_MANAGEMENT /* don't stage mgnt messages */)   
         {
             message->releaseContent(store); 
             staging = true;
diff --git a/cpp/src/tests/MessageBuilderTest.cpp b/cpp/src/tests/MessageBuilderTest.cpp
index 54646dcde6..1f3f830633 100644
--- a/cpp/src/tests/MessageBuilderTest.cpp
+++ b/cpp/src/tests/MessageBuilderTest.cpp
@@ -217,4 +217,29 @@ QPID_AUTO_TEST_CASE(testStaging)
     BOOST_CHECK(!builder.getMessage()->isContentLoaded());
 }
 
+QPID_AUTO_TEST_CASE(testNoManagementStaging)
+{
+    // Make sure management messages don't stage
+    MockMessageStore store;
+    MessageBuilder builder(&store, 5);
+    builder.start(SequenceNumber());
+        
+    std::string data1("abcdefg");
+    std::string exchange("qpid.management");
+    std::string key("builder-exchange");
+
+    AMQFrame method(MessageTransferBody(ProtocolVersion(), exchange, 0, 0));
+    AMQFrame header((AMQHeaderBody()));
+    AMQFrame content1((AMQContentBody(data1)));
+
+    header.castBody<AMQHeaderBody>()->get<MessageProperties>(true)->setContentLength(data1.size());        
+    header.castBody<AMQHeaderBody>()->get<DeliveryProperties>(true)->setRoutingKey(key);
+
+    builder.handle(method);
+    builder.handle(header);
+
+    builder.handle(content1);
+    BOOST_CHECK(store.expectationsMet());
+    BOOST_CHECK_EQUAL((uint64_t) 0, builder.getMessage()->getPersistenceId());
+}
 QPID_AUTO_TEST_SUITE_END()
-- 
cgit v1.2.1