You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by gt...@apache.org on 2010/05/24 17:36:15 UTC
svn commit: r947671 -
/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
Author: gtully
Date: Mon May 24 15:36:14 2010
New Revision: 947671
URL: http://svn.apache.org/viewvc?rev=947671&view=rev
Log:
resolve ConnectorXBeanConfigTest, broker service needs to null more impls at shutdown to allow restart to find new impls of scheudaler etc. consequence of fixes for https://issues.apache.org/activemq/browse/AMQ-2620 and
https://issues.apache.org/activemq/browse/AMQ-2568
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=947671&r1=947670&r2=947671&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 Mon May 24 15:36:14 2010
@@ -563,14 +563,19 @@ public class BrokerService implements Se
VMTransportFactory.stopped(getBrokerName());
if (broker != null) {
stopper.stop(broker);
+ broker = null;
}
+
if (tempDataStore != null) {
tempDataStore.stop();
+ tempDataStore = null;
}
stopper.stop(persistenceAdapter);
+ persistenceAdapter = null;
slave = true;
if (isUseJmx()) {
stopper.stop(getManagementContext());
+ managementContext = null;
}
// Clear SelectorParser cache to free memory
SelectorParser.clearCache();
@@ -596,13 +601,20 @@ public class BrokerService implements Se
}
if (this.taskRunnerFactory != null) {
this.taskRunnerFactory.shutdown();
+ this.taskRunnerFactory = null;
}
if (this.scheduler != null) {
this.scheduler.stop();
+ this.scheduler = null;
}
if (this.executor != null) {
this.executor.shutdownNow();
+ this.executor = null;
}
+
+ this.destinationInterceptors = null;
+ this.destinationFactory = null;
+
LOG.info("ActiveMQ JMS Message Broker (" + getBrokerName() + ", " + brokerId + ") stopped");
synchronized (shutdownHooks) {
for (Runnable hook : shutdownHooks) {