Repository: activemq-artemis Updated Branches: refs/heads/2.6.x 1cd12c5df -> 170562882
ARTEMIS-2021 setting flag before shutdown (cherry picked from commit 6bdfcd04f5f2e6a7e8a7dcfeebc6bc0ede89d0d8) Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/17056288 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/17056288 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/17056288 Branch: refs/heads/2.6.x Commit: 1705628826a2f6271a18b59127326cb343b71894 Parents: 1cd12c5 Author: Clebert Suconic <clebertsuco...@apache.org> Authored: Thu Aug 9 19:16:23 2018 -0400 Committer: Clebert Suconic <clebertsuco...@apache.org> Committed: Thu Aug 9 19:17:06 2018 -0400 ---------------------------------------------------------------------- .../apache/activemq/artemis/core/server/NetworkHealthCheck.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/17056288/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/NetworkHealthCheck.java ---------------------------------------------------------------------- diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/NetworkHealthCheck.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/NetworkHealthCheck.java index 75d823a..ff4fd86 100644 --- a/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/NetworkHealthCheck.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/NetworkHealthCheck.java @@ -289,10 +289,10 @@ public class NetworkHealthCheck extends ActiveMQScheduledComponent { } else { for (ActiveMQComponent component : componentList) { if (component.isStarted()) { + ownShutdown = true; try { ActiveMQUtilLogger.LOGGER.stoppingService(component.toString()); component.stop(); - ownShutdown = true; } catch (Exception e) { ActiveMQUtilLogger.LOGGER.errorStoppingComponent(e, component.toString()); }