You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2016/03/15 21:22:34 UTC

[51/59] [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/5d171e3f
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/5d171e3f
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/5d171e3f

Branch: refs/heads/refactor-openwire
Commit: 5d171e3f871d49b6d2c8ee5db63c77f9a8e59785
Parents: e2c8694
Author: Clebert Suconic <cl...@apache.org>
Authored: Fri Feb 26 11:14:54 2016 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Mar 15 16:21:23 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/5d171e3f/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();
-      }
-   }
-
 }