diff options
| author | Gordon Sim <gsim@apache.org> | 2013-10-15 12:41:53 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2013-10-15 12:41:53 +0000 |
| commit | 16a317a30e82a3f83739f8953ad67babedc6c646 (patch) | |
| tree | bd7f569ad56383b51a93579c83ab582d72b60b9b /qpid/cpp/src/qpid/broker/amqp/Outgoing.cpp | |
| parent | 8ec3ef4b4bd0fa0478542e194f1ea81953de21b9 (diff) | |
| download | qpid-python-16a317a30e82a3f83739f8953ad67babedc6c646.tar.gz | |
QPID-5229: implement release and reject
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1532307 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/qpid/broker/amqp/Outgoing.cpp')
| -rw-r--r-- | qpid/cpp/src/qpid/broker/amqp/Outgoing.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/qpid/cpp/src/qpid/broker/amqp/Outgoing.cpp b/qpid/cpp/src/qpid/broker/amqp/Outgoing.cpp index 6b9da64017..31704cca73 100644 --- a/qpid/cpp/src/qpid/broker/amqp/Outgoing.cpp +++ b/qpid/cpp/src/qpid/broker/amqp/Outgoing.cpp @@ -136,11 +136,12 @@ void OutgoingFromQueue::handle(pn_delivery_t* delivery) outgoingMessageRejected(); break; case PN_RELEASED: - if (preAcquires()) queue->release(r.cursor, false);//TODO: for PN_RELEASED, delivery count should not be incremented + if (preAcquires()) queue->release(r.cursor, false);//for PN_RELEASED, delivery count should not be incremented outgoingMessageRejected();//TODO: not quite true... break; case PN_MODIFIED: - if (preAcquires()) queue->release(r.cursor, true);//TODO: proper handling of modified + if (preAcquires()) queue->release(r.cursor, pn_disposition_is_failed(pn_delivery_remote(delivery))); + //TODO: handle undeliverable-here and message-annotations outgoingMessageRejected();//TODO: not quite true... break; default: |