Repository: activemq-artemis Updated Branches: refs/heads/master 5372059e7 -> 335381d19
ARTEMIS-1186 Consumer.receive hangs if http acceptor with non-zero batch-delay is configured Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/9b5440e5 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/9b5440e5 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/9b5440e5 Branch: refs/heads/master Commit: 9b5440e5a4a381d17e475df377a6eef56812cf83 Parents: 5372059 Author: Tomas Hofman <[email protected]> Authored: Mon May 29 12:00:32 2017 +0200 Committer: Clebert Suconic <[email protected]> Committed: Tue May 30 19:05:43 2017 -0400 ---------------------------------------------------------------------- .../artemis/core/remoting/impl/netty/NettyAcceptor.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/9b5440e5/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java index fa2723c..1fde73f 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java @@ -380,13 +380,13 @@ public class NettyAcceptor extends AbstractAcceptor { notificationService.sendNotification(notification); } - if (batchDelay > 0) { - flusher = new BatchFlusher(); + ActiveMQServerLogger.LOGGER.startedAcceptor(acceptorType, host, port, protocolsString); + } - batchFlusherFuture = scheduledThreadPool.scheduleWithFixedDelay(flusher, batchDelay, batchDelay, TimeUnit.MILLISECONDS); - } + if (batchDelay > 0) { + flusher = new BatchFlusher(); - ActiveMQServerLogger.LOGGER.startedAcceptor(acceptorType, host, port, protocolsString); + batchFlusherFuture = scheduledThreadPool.scheduleWithFixedDelay(flusher, batchDelay, batchDelay, TimeUnit.MILLISECONDS); } }
