From 8fcc44bd56b1aab2d476f6b887f30e1ae5037e3d Mon Sep 17 00:00:00 2001 From: Francisco Borges Date: Tue, 26 Mar 2013 17:09:01 +0100 Subject: [PATCH] Turn off failureCheckAndFlushThread when freezing the connections. Also remove a duplicate check on "started" at stop(). --- .../core/remoting/server/impl/RemotingServiceImpl.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/hornetq-server/src/main/java/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java b/hornetq-server/src/main/java/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java index a5ce5828e3b..961bc54fbed 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java +++ b/hornetq-server/src/main/java/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java @@ -278,6 +278,10 @@ public synchronized void allowInvmSecurityOverride(HornetQPrincipal principal) public synchronized void freeze(final CoreRemotingConnection connectionToKeepOpen) { + if (!started) + return; + failureCheckAndFlushThread.close(false); + for (Acceptor acceptor : acceptors) { try @@ -321,11 +325,6 @@ public void stop(final boolean criticalError) throws Exception return; } - if (!started) - { - return; - } - failureCheckAndFlushThread.close(criticalError); // We need to stop them accepting first so no new connections are accepted after we send the disconnect message