You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ke...@apache.org on 2009/07/03 06:55:14 UTC
svn commit: r790788 - in
/geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/resources:
activemq-template.xml activemq.xml
Author: kevan
Date: Fri Jul 3 04:55:14 2009
New Revision: 790788
URL: http://svn.apache.org/viewvc?rev=790788&view=rev
Log:
Fix ActiveMQ shutdown problem. Turn off ActiveMQ's shutdown hook. Geronimo will shutdown the AMQ broker. Avoids error when broker is shutdown twice. Once by Geronimo another time by ActiveMQ.
Modified:
geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/resources/activemq-template.xml
geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/resources/activemq.xml
Modified: geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/resources/activemq-template.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/resources/activemq-template.xml?rev=790788&r1=790787&r2=790788&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/resources/activemq-template.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/resources/activemq-template.xml Fri Jul 3 04:55:14 2009
@@ -37,7 +37,7 @@
</property>
</bean>
- <broker xmlns="http://activemq.apache.org/schema/core" brokerName="${activemq.brokerName}" tmpDataDirectory="${activemq.data}/tmp_storage">
+ <broker xmlns="http://activemq.apache.org/schema/core" brokerName="${activemq.brokerName}" tmpDataDirectory="${activemq.data}/tmp_storage" useShutdownHook="false">
<!--
Configure per-destination policies on the broker. The policies
Modified: geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/resources/activemq.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/resources/activemq.xml?rev=790788&r1=790787&r2=790788&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/resources/activemq.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/resources/activemq.xml Fri Jul 3 04:55:14 2009
@@ -37,7 +37,7 @@
</property>
</bean>
- <broker xmlns="http://activemq.apache.org/schema/core" brokerName="${activemq.brokerName}" tmpDataDirectory="${activemq.data}/tmp_storage">
+ <broker xmlns="http://activemq.apache.org/schema/core" brokerName="${activemq.brokerName}" tmpDataDirectory="${activemq.data}/tmp_storage" useShutdownHook="false">
<!--
Configure per-destination policies on the broker. The policies