Repository: activemq-cpp Updated Branches: refs/heads/master 2a113ce30 -> 9ea1110e7
https://issues.apache.org/jira/browse/AMQCPP-578 send expired Ack instead of delivered when message is expired. Project: http://git-wip-us.apache.org/repos/asf/activemq-cpp/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-cpp/commit/9ea1110e Tree: http://git-wip-us.apache.org/repos/asf/activemq-cpp/tree/9ea1110e Diff: http://git-wip-us.apache.org/repos/asf/activemq-cpp/diff/9ea1110e Branch: refs/heads/master Commit: 9ea1110e72062c2c78c5560984cb3c0cff08d3f4 Parents: 2a113ce Author: Timothy Bish <[email protected]> Authored: Fri Jul 17 14:48:20 2015 -0400 Committer: Timothy Bish <[email protected]> Committed: Fri Jul 17 14:48:20 2015 -0400 ---------------------------------------------------------------------- .../src/main/activemq/core/kernels/ActiveMQConsumerKernel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/9ea1110e/activemq-cpp/src/main/activemq/core/kernels/ActiveMQConsumerKernel.cpp ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/activemq/core/kernels/ActiveMQConsumerKernel.cpp b/activemq-cpp/src/main/activemq/core/kernels/ActiveMQConsumerKernel.cpp index 7ab08e5..ad9d77a 100644 --- a/activemq-cpp/src/main/activemq/core/kernels/ActiveMQConsumerKernel.cpp +++ b/activemq-cpp/src/main/activemq/core/kernels/ActiveMQConsumerKernel.cpp @@ -1176,7 +1176,7 @@ void ActiveMQConsumerKernel::afterMessageIsConsumed(Pointer<MessageDispatch> mes if (this->internal->unconsumedMessages->isClosed()) { return; } else if (messageExpired) { - acknowledge(message, ActiveMQConstants::ACK_TYPE_DELIVERED); + acknowledge(message, ActiveMQConstants::ACK_TYPE_EXPIRED); return; } else if (session->isTransacted()) { return;
