From 9fd4909832e16734c47c13eebbe4aca66640b1b0 Mon Sep 17 00:00:00 2001
From: Gordon Sim <gsim@apache.org>
Date: Thu, 6 Mar 2008 17:52:59 +0000
Subject: Fixes to c++ broker: - use final version of delivery properties where
 appropriate - start sequence numbering of outgoing messages at 0 - explicit
 accept-mode is now 0 (no more confirm-mode) - add default initialisers for
 numeric fields in methods

Converted some more python tests to use final 0-10 client.



git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@634368 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/src/qpid/broker/MessageDelivery.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 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 22053260c5..9ef7090cd9 100644
--- a/cpp/src/qpid/broker/MessageDelivery.cpp
+++ b/cpp/src/qpid/broker/MessageDelivery.cpp
@@ -90,14 +90,17 @@ struct MessageDeliveryToken : BaseToken
     AMQFrame sendMethod(intrusive_ptr<Message> msg, DeliveryId /*id*/)
     {
         //may need to set the redelivered flag:
-        if (msg->getRedelivered()){
-            msg->getProperties<DeliveryProperties>()->setRedelivered(true);
-        }
         if (isPreview) {
+            if (msg->getRedelivered()){
+                msg->getProperties<DeliveryProperties>()->setRedelivered(true);
+            }
             return AMQFrame(in_place<MessageTransferBody>(
                 ProtocolVersion(), 0, destination,
                 confirmMode, acquireMode));
         } else {
+            if (msg->getRedelivered()){
+                msg->getProperties<DeliveryProperties010>()->setRedelivered(true);
+            }
             return AMQFrame(in_place<Message010TransferBody>(
                 ProtocolVersion(), destination, confirmMode, acquireMode));
         }
-- 
cgit v1.2.1