From b7c474ea80fce5d53236aeea9f74c9107da0152d Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Thu, 6 Mar 2008 11:44:36 +0000 Subject: Fix message delivery for 0-10 final codepath Convert two more python tests to use 0-10 client git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@634229 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/broker/MessageDelivery.cpp | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) (limited to 'cpp/src/qpid/broker/MessageDelivery.cpp') diff --git a/cpp/src/qpid/broker/MessageDelivery.cpp b/cpp/src/qpid/broker/MessageDelivery.cpp index 886008c213..22053260c5 100644 --- a/cpp/src/qpid/broker/MessageDelivery.cpp +++ b/cpp/src/qpid/broker/MessageDelivery.cpp @@ -82,9 +82,10 @@ struct MessageDeliveryToken : BaseToken const std::string destination; const u_int8_t confirmMode; const u_int8_t acquireMode; + const bool isPreview; - MessageDeliveryToken(const std::string& d, u_int8_t c, u_int8_t a) : - destination(d), confirmMode(c), acquireMode(a) {} + MessageDeliveryToken(const std::string& d, u_int8_t c, u_int8_t a, bool p) : + destination(d), confirmMode(c), acquireMode(a), isPreview(p) {} AMQFrame sendMethod(intrusive_ptr msg, DeliveryId /*id*/) { @@ -92,9 +93,14 @@ struct MessageDeliveryToken : BaseToken if (msg->getRedelivered()){ msg->getProperties()->setRedelivered(true); } - return AMQFrame(in_place( - ProtocolVersion(), 0, destination, - confirmMode, acquireMode)); + if (isPreview) { + return AMQFrame(in_place( + ProtocolVersion(), 0, destination, + confirmMode, acquireMode)); + } else { + return AMQFrame(in_place( + ProtocolVersion(), destination, confirmMode, acquireMode)); + } } }; @@ -114,7 +120,13 @@ DeliveryToken::shared_ptr MessageDelivery::getBasicConsumeToken(const string& co DeliveryToken::shared_ptr MessageDelivery::getMessageDeliveryToken(const std::string& destination, u_int8_t confirmMode, u_int8_t acquireMode) { - return DeliveryToken::shared_ptr(new MessageDeliveryToken(destination, confirmMode, acquireMode)); + return DeliveryToken::shared_ptr(new MessageDeliveryToken(destination, confirmMode, acquireMode, false)); +} + +DeliveryToken::shared_ptr MessageDelivery::getPreviewMessageDeliveryToken(const std::string& destination, + u_int8_t confirmMode, u_int8_t acquireMode) +{ + return DeliveryToken::shared_ptr(new MessageDeliveryToken(destination, confirmMode, acquireMode, true)); } void MessageDelivery::deliver(QueuedMessage& msg, -- cgit v1.2.1