Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 56842195EF for ; Wed, 16 Mar 2016 01:53:29 +0000 (UTC) Received: (qmail 67999 invoked by uid 500); 16 Mar 2016 01:53:27 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 67930 invoked by uid 500); 16 Mar 2016 01:53:27 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 66136 invoked by uid 99); 16 Mar 2016 01:53:26 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Mar 2016 01:53:26 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C8CBAE03E8; Wed, 16 Mar 2016 01:53:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: clebertsuconic@apache.org To: commits@activemq.apache.org Date: Wed, 16 Mar 2016 01:54:13 -0000 Message-Id: <1b282f2d4de741788b4217c8cf91ce55@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [49/60] [abbrv] activemq-artemis git commit: fixing testsuite (the testuie broke in a lot of places after this fix now being reverted 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/6b3d9d92 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/6b3d9d92 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/6b3d9d92 Branch: refs/heads/refactor-openwire Commit: 6b3d9d924ffdacf7aa11c5090d16cca1ed473e97 Parents: 3333d9e Author: Clebert Suconic Authored: Fri Feb 26 11:14:54 2016 -0500 Committer: Clebert Suconic Committed: Tue Mar 15 20:45:29 2016 -0400 ---------------------------------------------------------------------- .../core/protocol/openwire/amq/AMQServerConsumer.java | 9 --------- 1 file changed, 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6b3d9d92/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 9e93b3d..b37e1cf 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 @@ -189,13 +189,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(); - } - } - }