Repository: activemq-artemis Updated Branches: refs/heads/master 5a169013e -> 6674935e8
ARTEMIS-1679 Stopping consumer no need to wait until all queued tasks done Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/898940f5 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/898940f5 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/898940f5 Branch: refs/heads/master Commit: 898940f5bfe022b599398c1226e919e5bec378ed Parents: 5a16901 Author: yang wei <wy96...@gmail.com> Authored: Tue Feb 13 12:44:10 2018 +0800 Committer: Clebert Suconic <clebertsuco...@apache.org> Committed: Wed Feb 21 16:19:41 2018 -0500 ---------------------------------------------------------------------- .../activemq/artemis/core/client/impl/ClientConsumerImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/898940f5/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerImpl.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerImpl.java index ccaa004..19987ff 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerImpl.java @@ -482,8 +482,6 @@ public final class ClientConsumerImpl implements ClientConsumerInternal { @Override public void stop(final boolean waitForOnMessage) throws ActiveMQException { - waitForOnMessageToComplete(waitForOnMessage); - if (browseOnly) { // stop shouldn't affect browser delivery return; @@ -496,6 +494,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal { stopped = true; } + waitForOnMessageToComplete(waitForOnMessage); } @Override
