activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [activemq-artemis] branch master updated: ARTEMIS-2335 Fixing delivery logic for message group on negative attemps
Date Fri, 10 May 2019 16:51:39 GMT
This is an automated email from the ASF dual-hosted git repository.

clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/master by this push:
     new fc76026  ARTEMIS-2335 Fixing delivery logic for message group on negative attemps
     new 0ffe1ab  This closes #2665
fc76026 is described below

commit fc760265a22a5a45ca39226649e0745657c232a8
Author: Clebert Suconic <clebertsuconic@apache.org>
AuthorDate: Fri May 10 11:49:28 2019 -0400

    ARTEMIS-2335 Fixing delivery logic for message group on negative attemps
    
    OpenWireGroupingTest::testGrouping is fixed after this change as it was intermittently
failing
---
 .../java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
index 1b49e08..aaa562c 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
@@ -2599,6 +2599,10 @@ public class QueueImpl extends CriticalComponentImpl implements Queue
{
 
                if (status == HandleStatus.HANDLED) {
 
+                  // if a message was delivered, any previous negative attemps need to be
cleared
+                  // this is to avoid breaks on the loop when checking for any other factors.
+                  noDelivery = 0;
+
                   if (redistributor == null) {
                      ref = handleMessageGroup(ref, consumer, groupConsumer, groupID);
                   }


Mime
View raw message