From 803abe48a43f79c594e398f9b41e9457811275a9 Mon Sep 17 00:00:00 2001
From: Robert Davies <rajdavies@apache.org>
Date: Fri, 25 Apr 2008 14:42:45 +0000
Subject: [PATCH] Apply patch for
 http://issues.apache.org/activemq/browse/AMQ-1690

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@651618 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/org/apache/activemq/broker/BrokerService.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java b/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
index 7edc1ef2a1..f31c885914 100644
--- a/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
+++ b/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
@@ -481,6 +481,11 @@ public class BrokerService implements Service {
             }
         }
         stopAllConnectors(stopper);
+        // remove any VMTransports connected
+        // this has to be done after services are stopped,
+        // to avoid timimg issue with discovery (spinning up a new instance)
+        BrokerRegistry.getInstance().unbind(getBrokerName());
+        VMTransportFactory.stopped(getBrokerName());        
         stopper.stop(persistenceAdapter);
         if (broker != null) {
             stopper.stop(broker);
@@ -502,11 +507,6 @@ public class BrokerService implements Service {
             }
             stopper.stop(getManagementContext());
         }
-        // remove any VMTransports connected
-        // this has to be done after services are stopped,
-        // to avoid timimg issue with discovery (spinning up a new instance)
-        BrokerRegistry.getInstance().unbind(getBrokerName());
-        VMTransportFactory.stopped(getBrokerName());
         stopped.set(true);
         stoppedLatch.countDown();
         LOG.info("ActiveMQ JMS Message Broker (" + getBrokerName() + ", " + brokerId + ") stopped");