Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-2408 A few tweaks on acceptor async stop

This commit is contained in:
Clebert Suconic 2019-07-18 16:23:19 -04:00
parent aeecb6f70b
commit 989b3a516e
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java
View File

@ -650,7 +650,7 @@ public class NettyAcceptor extends AbstractAcceptor {
public void stop() throws Exception { public void stop() throws Exception {
CountDownLatch latch = new CountDownLatch(1); CountDownLatch latch = new CountDownLatch(1);
asyncStop(() -> latch.countDown()); asyncStop(latch::countDown);
latch.await(); latch.await();
} }

2
artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/server/impl/RemotingServiceImpl.java
View File

@ -412,7 +412,7 @@ public class RemotingServiceImpl implements RemotingService, ServerConnectionLif
CountDownLatch acceptorCountDownLatch = new CountDownLatch(acceptors.size()); CountDownLatch acceptorCountDownLatch = new CountDownLatch(acceptors.size());
for (Acceptor acceptor : acceptors.values()) { for (Acceptor acceptor : acceptors.values()) {
try { try {
acceptor.asyncStop(() -> acceptorCountDownLatch.countDown()); acceptor.asyncStop(acceptorCountDownLatch::countDown);
} catch (Throwable t) { } catch (Throwable t) {
ActiveMQServerLogger.LOGGER.errorStoppingAcceptor(acceptor.getName()); ActiveMQServerLogger.LOGGER.errorStoppingAcceptor(acceptor.getName());
} }

2
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
View File

@ -1269,8 +1269,6 @@ public class ActiveMQServerImpl implements ActiveMQServer {
this.analyzer = null; this.analyzer = null;
} }
activateCallbacks.clear();
if (identity != null) { if (identity != null) {
ActiveMQServerLogger.LOGGER.serverStopped("identity=" + identity + ",version=" + getVersion().getFullVersion(), tempNodeID, getUptime()); ActiveMQServerLogger.LOGGER.serverStopped("identity=" + identity + ",version=" + getVersion().getFullVersion(), tempNodeID, getUptime());
} else { } else {