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/16 16:22:19 UTC

[50/61] [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/aa7fb570
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/aa7fb570
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/aa7fb570

Branch: refs/heads/refactor-openwire
Commit: aa7fb570cd2eec32669191bebc165352dd1c68af
Parents: 2d6bd95
Author: Clebert Suconic <cl...@apache.org>
Authored: Fri Feb 26 11:14:54 2016 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Mar 16 11:19:15 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/aa7fb570/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();
-      }
-   }
-
 }