Use amqp 0-9 request/response framing in broker and client.

Updated: framing, client, broker, generated code.

The new request/response data (request-id etc.) is not yet being used,
we are simply running the old Basic protocol over request/response frames.


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/qpid.0-9@495679 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 3 insertions, 3 deletions

diff --git a/cpp/lib/client/ClientChannel.cpp b/cpp/lib/client/ClientChannel.cpp
index 3d0b547b07..37aedd5607 100644
--- a/cpp/lib/client/ClientChannel.cpp
+++ b/cpp/lib/client/ClientChannel.cpp
@@ -171,7 +171,7 @@ void Channel::cancelAll(){
     for(consumer_iterator i = consumers.begin(); i != consumers.end(); i = consumers.begin()){
         Consumer* c = i->second;
         if((c->ackMode == LAZY_ACK || c->ackMode == AUTO_ACK) && c->lastDeliveryTag > 0){
-            out->send(new AMQFrame(version, id, new BasicAckBody(c->lastDeliveryTag, true)));
+            out->send(new AMQFrame(version, id, new BasicAckBody(version, c->lastDeliveryTag, true)));
         }
         consumers.erase(i);
         delete c;
@@ -377,8 +377,8 @@ void Channel::deliver(Consumer* consumer, Message& msg){
             if(++(consumer->count) < prefetch) break;
             //else drop-through
         case AUTO_ACK:
-            out->send(new AMQFrame(version, id, new BasicAckBody(msg.getDeliveryTag(), multiple)));
-            consumer->lastDeliveryTag = 0;
+          out->send(new AMQFrame(version, id, new BasicAckBody(version, msg.getDeliveryTag(), multiple)));
+          consumer->lastDeliveryTag = 0;
         }
     }