activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rajdav...@apache.org
Subject svn commit: r651618 - /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
Date Fri, 25 Apr 2008 14:42:55 GMT
Author: rajdavies
Date: Fri Apr 25 07:42:45 2008
New Revision: 651618

URL: http://svn.apache.org/viewvc?rev=651618&view=rev
Log:
Apply patch for http://issues.apache.org/activemq/browse/AMQ-1690

Modified:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java?rev=651618&r1=651617&r2=651618&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
(original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
Fri Apr 25 07:42:45 2008
@@ -481,6 +481,11 @@
             }
         }
         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 @@
             }
             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");



Mime
View raw message