mirror of https://github.com/apache/activemq.git
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
This commit is contained in:
parent
e54a1261d5
commit
803abe48a4
|
@ -481,6 +481,11 @@ public class BrokerService implements Service {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
stopAllConnectors(stopper);
|
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);
|
stopper.stop(persistenceAdapter);
|
||||||
if (broker != null) {
|
if (broker != null) {
|
||||||
stopper.stop(broker);
|
stopper.stop(broker);
|
||||||
|
@ -502,11 +507,6 @@ public class BrokerService implements Service {
|
||||||
}
|
}
|
||||||
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)
|
|
||||||
BrokerRegistry.getInstance().unbind(getBrokerName());
|
|
||||||
VMTransportFactory.stopped(getBrokerName());
|
|
||||||
stopped.set(true);
|
stopped.set(true);
|
||||||
stoppedLatch.countDown();
|
stoppedLatch.countDown();
|
||||||
LOG.info("ActiveMQ JMS Message Broker (" + getBrokerName() + ", " + brokerId + ") stopped");
|
LOG.info("ActiveMQ JMS Message Broker (" + getBrokerName() + ", " + brokerId + ") stopped");
|
||||||
|
|
Loading…
Reference in New Issue