fixing testsuite (the testuie broke in a lot of places after this fix now being reverted
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/ea0239b8 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/ea0239b8 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/ea0239b8 Branch: refs/heads/refactor-openwire Commit: ea0239b8cd953d9ae843c3b2740a81dcf965fbec Parents: 552be8c Author: Clebert Suconic <[email protected]> Authored: Fri Feb 26 11:14:54 2016 -0500 Committer: Clebert Suconic <[email protected]> Committed: Tue Mar 1 11:37:32 2016 -0500 ---------------------------------------------------------------------- .../core/protocol/openwire/amq/AMQServerConsumer.java | 9 --------- 1 file changed, 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ea0239b8/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQServerConsumer.java ---------------------------------------------------------------------- diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQServerConsumer.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQServerConsumer.java index 34789b0..7215f64 100644 --- a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQServerConsumer.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQServerConsumer.java @@ -187,13 +187,4 @@ public class AMQServerConsumer extends ServerConsumerImpl { } } - @Override - protected void updateDeliveryCountForCanceledRef(MessageReference ref, boolean failed) { - //activemq5 doesn't decrease the count - //when not failed. - if (failed) { - ref.decrementDeliveryCount(); - } - } - }
