diff options
| author | Carl C. Trieloff <cctrieloff@apache.org> | 2006-12-20 22:29:38 +0000 |
|---|---|---|
| committer | Carl C. Trieloff <cctrieloff@apache.org> | 2006-12-20 22:29:38 +0000 |
| commit | 786c13d1833f626bf47262dd16ea48c81ac3887f (patch) | |
| tree | a24df1b5de4584d3055a754235e93bdee1ad0075 /cpp/lib/broker/BrokerChannel.cpp | |
| parent | dc0593dbce33328266edade35431a6571342786c (diff) | |
| download | qpid-python-786c13d1833f626bf47262dd16ea48c81ac3887f.tar.gz | |
Support for multi version, merge part 1. - can still refactor out dup use of
version object in client and server opperations.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@489212 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/lib/broker/BrokerChannel.cpp')
| -rw-r--r-- | cpp/lib/broker/BrokerChannel.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/cpp/lib/broker/BrokerChannel.cpp b/cpp/lib/broker/BrokerChannel.cpp index 5d4f68a8af..f569872770 100644 --- a/cpp/lib/broker/BrokerChannel.cpp +++ b/cpp/lib/broker/BrokerChannel.cpp @@ -31,7 +31,7 @@ using namespace qpid::framing; using namespace qpid::sys; -Channel::Channel(OutputHandler* _out, int _id, u_int32_t _framesize, MessageStore* const _store, u_int64_t _stagingThreshold) : +Channel::Channel(qpid::framing::ProtocolVersion& _version, OutputHandler* _out, int _id, u_int32_t _framesize, MessageStore* const _store, u_int64_t _stagingThreshold) : id(_id), out(_out), currentDeliveryTag(1), @@ -41,7 +41,8 @@ Channel::Channel(OutputHandler* _out, int _id, u_int32_t _framesize, MessageStor framesize(_framesize), tagGenerator("sgen"), store(_store), - messageBuilder(this, _store, _stagingThreshold){ + messageBuilder(this, _store, _stagingThreshold), + version(_version){ outstanding.reset(); } @@ -118,7 +119,7 @@ void Channel::deliver(Message::shared_ptr& msg, const string& consumerTag, Queue outstanding.count++; } //send deliver method, header and content(s) - msg->deliver(out, id, consumerTag, deliveryTag, framesize); + msg->deliver(out, id, consumerTag, deliveryTag, framesize, &version); } bool Channel::checkPrefetch(Message::shared_ptr& msg){ @@ -242,7 +243,7 @@ bool Channel::get(Queue::shared_ptr queue, bool ackExpected){ if(msg){ Mutex::ScopedLock locker(deliveryLock); u_int64_t myDeliveryTag = currentDeliveryTag++; - msg->sendGetOk(out, id, queue->getMessageCount() + 1, myDeliveryTag, framesize); + msg->sendGetOk(out, id, queue->getMessageCount() + 1, myDeliveryTag, framesize, &version); if(ackExpected){ unacked.push_back(DeliveryRecord(msg, queue, myDeliveryTag)); } @@ -253,5 +254,5 @@ bool Channel::get(Queue::shared_ptr queue, bool ackExpected){ } void Channel::deliver(Message::shared_ptr& msg, const string& consumerTag, u_int64_t deliveryTag){ - msg->deliver(out, id, consumerTag, deliveryTag, framesize); + msg->deliver(out, id, consumerTag, deliveryTag, framesize, &version); } |