https://issues.apache.org/jira/browse/AMQCPP-501

If no messages delivered to client we don't need to remain in the TX, just close as normal so that prefetched messages get redispatched. git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-cpp/trunk@1504502 13f79535-47bb-0310-9956-ffa450edef68
apache · Jul 18, 2013 · 8c56eeb · 8c56eeb
1 parent 4218916
commit 8c56eeb
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/activemq-cpp/src/main/activemq/core/kernels/ActiveMQConsumerKernel.cpp b/activemq-cpp/src/main/activemq/core/kernels/ActiveMQConsumerKernel.cpp
@@ -792,7 +792,8 @@ void ActiveMQConsumerKernel::close() {
     try {
         if (!this->isClosed()) {
 
-            if (this->session->getTransactionContext() != NULL &&
+            if (!this->internal->dispatchedMessages.isEmpty() &&
+                this->session->getTransactionContext() != NULL &&
                 this->session->getTransactionContext()->isInTransaction() &&
                 this->internal->closeSyncRegistered.compareAndSet(false, true)) {