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, 4 insertions, 3 deletions

diff --git a/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp b/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp
index 3f5cccfedb..345ebfb66d 100644
--- a/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp
+++ b/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp
@@ -279,7 +279,8 @@ void populateHeaders(qpid::messaging::Message& message,
     if (deliveryProperties) {
         message.setTtl(qpid::messaging::Duration(deliveryProperties->getTtl()));
         message.setDurable(deliveryProperties->getDeliveryMode() == DELIVERY_MODE_PERSISTENT);
-        MessageImplAccess::get(message).redelivered = deliveryProperties->getRedelivered();
+        message.setPriority(deliveryProperties->getPriority());
+        message.setRedelivered(deliveryProperties->getRedelivered());
     }
     if (messageProperties) {
         message.setContentType(messageProperties->getContentType());
@@ -287,8 +288,8 @@ void populateHeaders(qpid::messaging::Message& message,
             message.setReplyTo(AddressResolution::convert(messageProperties->getReplyTo()));
         }
         message.setSubject(messageProperties->getApplicationHeaders().getAsString(SUBJECT));
-        message.getHeaders().clear();
-        translate(messageProperties->getApplicationHeaders(), message.getHeaders());
+        message.getProperties().clear();
+        translate(messageProperties->getApplicationHeaders(), message.getProperties());
         message.setCorrelationId(messageProperties->getCorrelationId());
         message.setUserId(messageProperties->getUserId());
     }