From ad03e768f64f38489cfc4f8520cfbc1740317133 Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Wed, 30 Apr 2014 03:41:23 +0000 Subject: QPID-5735: Correct calculation of amqp.redelivered git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1591183 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/qpid/broker/Selector.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'qpid/cpp') diff --git a/qpid/cpp/src/qpid/broker/Selector.cpp b/qpid/cpp/src/qpid/broker/Selector.cpp index 40a0f019ab..b9888b4cd4 100644 --- a/qpid/cpp/src/qpid/broker/Selector.cpp +++ b/qpid/cpp/src/qpid/broker/Selector.cpp @@ -92,7 +92,9 @@ const Value MessageSelectorEnv::specialValue(const string& id) const if ( id=="delivery_mode" ) { v = msg.getEncoding().isPersistent() ? PERSISTENT : NON_PERSISTENT; } else if ( id=="redelivered" ) { - v = msg.getDeliveryCount()>0 ? true : false; + // Although redelivered is defined to be true delivery-count>0 if it is 0 now + // it will be 1 by the time the message is delivered + v = msg.getDeliveryCount()>=0 ? true : false; } else if ( id=="priority" ) { v = int64_t(msg.getPriority()); } else if ( id=="correlation_id" ) { -- cgit v1.2.1