diff options
| author | Gordon Sim <gsim@apache.org> | 2006-09-27 16:44:02 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2006-09-27 16:44:02 +0000 |
| commit | 9d718c2348708b0b27ce9fb9fcbf05c4b0a997cc (patch) | |
| tree | 4bea6ff87d58d3db712cbc727b9723680b1b981a /cpp/broker/src | |
| parent | 72aff4cc22932bd98b542ac9dd6393e23985e312 (diff) | |
| download | qpid-python-9d718c2348708b0b27ce9fb9fcbf05c4b0a997cc.tar.gz | |
Moved ack tests to basic class, added test for requeueing on recovery.
Implemented requeuing on recovery.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@450504 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/broker/src')
| -rw-r--r-- | cpp/broker/src/Channel.cpp | 2 | ||||
| -rw-r--r-- | cpp/broker/src/Message.cpp | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/cpp/broker/src/Channel.cpp b/cpp/broker/src/Channel.cpp index b49635e026..4fb6a52b99 100644 --- a/cpp/broker/src/Channel.cpp +++ b/cpp/broker/src/Channel.cpp @@ -173,7 +173,6 @@ void Channel::ack(u_int64_t deliveryTag, bool multiple){ void Channel::recover(bool requeue){ if(requeue){ - //TODO: need to set redelivered flag for_each(unacknowledged.begin(), unacknowledged.end(), Requeue()); unacknowledged.clear(); }else{ @@ -188,6 +187,7 @@ bool Channel::MatchAck::operator()(AckRecord& record) const{ } void Channel::Requeue::operator()(AckRecord& record) const{ + record.msg->redeliver(); record.queue->deliver(record.msg); } diff --git a/cpp/broker/src/Message.cpp b/cpp/broker/src/Message.cpp index 7afcd97934..8ebe40410a 100644 --- a/cpp/broker/src/Message.cpp +++ b/cpp/broker/src/Message.cpp @@ -32,7 +32,8 @@ Message::Message(const ConnectionToken* const _publisher, exchange(_exchange), routingKey(_routingKey), mandatory(_mandatory), - immediate(_immediate){ + immediate(_immediate), + redelivered(false){ } @@ -51,11 +52,15 @@ bool Message::isComplete(){ return header.get() && (header->getContentSize() == contentSize()); } +void Message::redeliver(){ + redelivered = true; +} + void Message::deliver(OutputHandler* out, int channel, string& consumerTag, u_int64_t deliveryTag, u_int32_t framesize){ - out->send(new AMQFrame(channel, new BasicDeliverBody(consumerTag, deliveryTag, false, exchange, routingKey))); + out->send(new AMQFrame(channel, new BasicDeliverBody(consumerTag, deliveryTag, redelivered, exchange, routingKey))); AMQBody::shared_ptr headerBody = static_pointer_cast<AMQBody, AMQHeaderBody>(header); out->send(new AMQFrame(channel, headerBody)); for(content_iterator i = content.begin(); i != content.end(); i++){ |