From 6bdfcd04f5f2e6a7e8a7dcfeebc6bc0ede89d0d8 Mon Sep 17 00:00:00 2001
From: Clebert Suconic <clebertsuconic@apache.org>
Date: Thu, 9 Aug 2018 19:16:23 -0400
Subject: [PATCH] ARTEMIS-2021 setting flag before shutdown

---
 .../apache/activemq/artemis/core/server/NetworkHealthCheck.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 75d823a6af..ff4fd86abe 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());
                }