QPID-664: renamed headers as properties (to match python); added priority

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@928878 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 5 insertions, 2 deletions

diff --git a/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp b/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp
index d0d945b934..b19b26f903 100644
--- a/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp
+++ b/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp
@@ -46,12 +46,15 @@ void OutgoingMessage::convert(const qpid::messaging::Message& from)
     if (address) {
         message.getMessageProperties().setReplyTo(AddressResolution::convert(address));
     }
-    translate(from.getHeaders(), message.getMessageProperties().getApplicationHeaders());
+    translate(from.getProperties(), message.getMessageProperties().getApplicationHeaders());
     message.getDeliveryProperties().setTtl(from.getTtl().getMilliseconds());
     if (from.getDurable()) {
         message.getDeliveryProperties().setDeliveryMode(DELIVERY_MODE_PERSISTENT);
     }
-
+    if (from.getRedelivered()) {
+        message.getDeliveryProperties().setRedelivered(true);
+    }
+    if (from.getPriority()) message.getDeliveryProperties().setPriority(from.getPriority());
 }
 
 namespace {