activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [2/2] activemq-artemis git commit: ARTEMIS-1317 Expire messages that got expiredAck() from OpenWire client
Date Thu, 03 Aug 2017 15:42:01 GMT
ARTEMIS-1317 Expire messages that got expiredAck() from OpenWire client

This fixes org.apache.activemq.JmsSendReceiveWithMessageExpirationTest


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/dfb181a8
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/dfb181a8
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/dfb181a8

Branch: refs/heads/master
Commit: dfb181a8b262c41ff41020eea664040e595a686c
Parents: c5c61f3
Author: Jiri Danek <jdanek@redhat.com>
Authored: Wed Aug 2 10:19:07 2017 +0200
Committer: Clebert Suconic <clebertsuconic@apache.org>
Committed: Thu Aug 3 11:41:58 2017 -0400

----------------------------------------------------------------------
 .../artemis/core/protocol/openwire/amq/AMQConsumer.java         | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/dfb181a8/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConsumer.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConsumer.java
b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConsumer.java
index 6bba4e1..61d2933 100644
--- a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConsumer.java
+++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConsumer.java
@@ -298,8 +298,9 @@ public class AMQConsumer {
          }
       }
       if (ack.isExpiredAck()) {
-         //adjust delivering count for expired messages
-         this.serverConsumer.getQueue().decDelivering(ackList.size());
+         for (MessageReference ref : ackList) {
+            ref.getQueue().expire(ref);
+         }
       }
    }
 


Mime
View raw message