Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

in stop() remove VMTransports after services stopped - to avoid a timing issue with 

discovery spinning up a new instance

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@491794 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Davies 2007-01-02 13:39:10 +00:00
parent 4cd0a27f91
commit 81c5b1500b
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
View File

@ -395,6 +395,7 @@ public class BrokerService implements Service, Serializable {
addShutdownHook(); addShutdownHook();
log.info("Using Persistence Adapter: " + getPersistenceAdapter()); log.info("Using Persistence Adapter: " + getPersistenceAdapter());
if (deleteAllMessagesOnStartup) { if (deleteAllMessagesOnStartup) {
deleteAllMessages(); deleteAllMessages();
} }
@ -448,8 +449,7 @@ public class BrokerService implements Service, Serializable {
stopAllConnectors(stopper); stopAllConnectors(stopper);
//remove any VMTransports connected
VMTransportFactory.stopped(getBrokerName());
stopper.stop(persistenceAdapter); stopper.stop(persistenceAdapter);
@ -476,7 +476,10 @@ public class BrokerService implements Service, Serializable {
} }
stopper.stop(getManagementContext()); 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)
VMTransportFactory.stopped(getBrokerName());
log.info("ActiveMQ JMS Message Broker (" + getBrokerName()+", "+brokerId+") stopped"); log.info("ActiveMQ JMS Message Broker (" + getBrokerName()+", "+brokerId+") stopped");
stopper.throwFirstException(); stopper.throwFirstException();
@ -1513,6 +1516,7 @@ public class BrokerService implements Service, Serializable {
for (Iterator iter = getNetworkConnectors().iterator(); iter.hasNext();) { for (Iterator iter = getNetworkConnectors().iterator(); iter.hasNext();) {
NetworkConnector connector = (NetworkConnector) iter.next(); NetworkConnector connector = (NetworkConnector) iter.next();
connector.setLocalUri(getVmConnectorURI());
connector.setBrokerName(getBrokerName()); connector.setBrokerName(getBrokerName());
connector.setDurableDestinations(getBroker().getDurableDestinations()); connector.setDurableDestinations(getBroker().getDurableDestinations());
connector.start(); connector.start();