Updated message.transfer encoding to use header and content segments (including new structs).

Unified more between the basic and message classes messages.



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

1 files changed, 4 insertions, 4 deletions

diff --git a/cpp/src/qpid/client/ClientChannel.cpp b/cpp/src/qpid/client/ClientChannel.cpp
index d1cc4734eb..cc2b7aedc8 100644
--- a/cpp/src/qpid/client/ClientChannel.cpp
+++ b/cpp/src/qpid/client/ClientChannel.cpp
@@ -181,8 +181,8 @@ bool Channel::get(Message& msg, const Queue& queue, AckMode ackMode) {
     if (response.isA<BasicGetEmptyBody>()) {
         return false;
     } else {
-        ReceivedContent::shared_ptr content = gets.pop();
-        content->populate(msg);
+        FrameSet::shared_ptr content = gets.pop();
+        msg.populate(*content);
         return true;
     }
 }
@@ -232,13 +232,13 @@ void Channel::join() {
 void Channel::run() {
     try {
         while (true) {
-            ReceivedContent::shared_ptr content = session->get();
+            FrameSet::shared_ptr content = session->get();
             //need to dispatch this to the relevant listener:
             if (content->isA<BasicDeliverBody>()) {
                 ConsumerMap::iterator i = consumers.find(content->as<BasicDeliverBody>()->getConsumerTag());
                 if (i != consumers.end()) {
                     Message msg;
-                    content->populate(msg);
+                    msg.populate(*content);
                     i->second.listener->received(msg);
                 } else {
                     QPID_LOG(warning, "Dropping message for unrecognised consumer: " << content->getMethod());