diff options
Diffstat (limited to 'qpid')
| -rw-r--r-- | qpid/cpp/src/qpid/broker/amqp/Header.cpp | 2 | ||||
| -rw-r--r-- | qpid/tests/src/py/qpid_tests/broker_1_0/general.py | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/broker/amqp/Header.cpp b/qpid/cpp/src/qpid/broker/amqp/Header.cpp index 493e757a56..038f0a90cc 100644 --- a/qpid/cpp/src/qpid/broker/amqp/Header.cpp +++ b/qpid/cpp/src/qpid/broker/amqp/Header.cpp @@ -56,7 +56,7 @@ bool Header::isFirstAcquirer() const uint32_t Header::getDeliveryCount() const { - return message.getDeliveryCount(); + return message.isRedelivered() ? message.getDeliveryCount() : 0; } Header::Header(const qpid::broker::Message& m) : message(m) {} diff --git a/qpid/tests/src/py/qpid_tests/broker_1_0/general.py b/qpid/tests/src/py/qpid_tests/broker_1_0/general.py index 3b48a78718..414d0b48f5 100644 --- a/qpid/tests/src/py/qpid_tests/broker_1_0/general.py +++ b/qpid/tests/src/py/qpid_tests/broker_1_0/general.py @@ -57,6 +57,9 @@ class GeneralTests (VersionTest): for expected in msgs: msg = rcv.fetch(0) assert msg.content == expected.content + try: + assert msg.properties.get('x-amqp-delivery-count') == 0, (msg.properties.get('x-amqp-delivery-count')) + except KeyError, e: None #default is 0 self.ssn.acknowledge(msg) rcv.close() |