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 2017/05/30 23:05:56 UTC
[1/2] activemq-artemis git commit: ARTEMIS-1186 Consumer.receive
hangs if http acceptor with non-zero batch-delay is configured
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 <th...@redhat.com>
Authored: Mon May 29 12:00:32 2017 +0200
Committer: Clebert Suconic <cl...@apache.org>
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);
}
}
[2/2] activemq-artemis git commit: This closes #1297
Posted by cl...@apache.org.
This closes #1297
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/335381d1
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/335381d1
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/335381d1
Branch: refs/heads/master
Commit: 335381d195719b52b0cea709d2d84da962a9a845
Parents: 5372059 9b5440e
Author: Clebert Suconic <cl...@apache.org>
Authored: Tue May 30 19:05:44 2017 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue May 30 19:05:44 2017 -0400
----------------------------------------------------------------------
.../artemis/core/remoting/impl/netty/NettyAcceptor.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------