diff options
| author | Kim van der Riet <kpvdr@apache.org> | 2006-11-22 16:57:35 +0000 |
|---|---|---|
| committer | Kim van der Riet <kpvdr@apache.org> | 2006-11-22 16:57:35 +0000 |
| commit | d46ac2955c4871c9f22067f47490095e2c5f1806 (patch) | |
| tree | 7e76ef7e4ca47e4cc57c83f7950bf97c3eceb210 /cpp/src/qpid/broker/Channel.cpp | |
| parent | 018723f3889e9a1f63585dddba8eecff1d168501 (diff) | |
| download | qpid-python-d46ac2955c4871c9f22067f47490095e2c5f1806.tar.gz | |
Merged AMQP version-sensitive generated files with C++ trunk. Phase 1 of merge complete - all locations where version info is required in the framing, broker and client code, the version has been hard-coded to mahor=8, minor=0. Next step: make broker and client version-aware.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@478237 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/broker/Channel.cpp')
| -rw-r--r-- | cpp/src/qpid/broker/Channel.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/cpp/src/qpid/broker/Channel.cpp b/cpp/src/qpid/broker/Channel.cpp index f3624b4f3d..2894e294e0 100644 --- a/cpp/src/qpid/broker/Channel.cpp +++ b/cpp/src/qpid/broker/Channel.cpp @@ -54,8 +54,7 @@ bool Channel::exists(const string& consumerTag){ } void Channel::consume(string& tag, Queue::shared_ptr queue, bool acks, bool exclusive, ConnectionToken* const connection){ - if(tag.empty()) tag = tagGenerator.generate(); - + if(tag.empty()) tag = tagGenerator.generate(); ConsumerImpl* c(new ConsumerImpl(this, tag, queue, connection, acks)); try{ queue->consume(c, exclusive);//may throw exception @@ -109,7 +108,7 @@ void Channel::rollback(){ accumulatedAck.clear(); } -void Channel::deliver(Message::shared_ptr& msg, string& consumerTag, Queue::shared_ptr& queue, bool ackExpected){ +void Channel::deliver(Message::shared_ptr& msg, const string& consumerTag, Queue::shared_ptr& queue, bool ackExpected){ Mutex::ScopedLock locker(deliveryLock); u_int64_t deliveryTag = currentDeliveryTag++; @@ -129,7 +128,7 @@ bool Channel::checkPrefetch(Message::shared_ptr& msg){ return countOk && sizeOk; } -Channel::ConsumerImpl::ConsumerImpl(Channel* _parent, string& _tag, +Channel::ConsumerImpl::ConsumerImpl(Channel* _parent, const string& _tag, Queue::shared_ptr _queue, ConnectionToken* const _connection, bool ack) : parent(_parent), tag(_tag), |