Author: gtully
Date: Fri Aug 19 23:40:42 2011
New Revision: 1159818
URL: http://svn.apache.org/viewvc?rev=1159818&view=rev
Log:
ensure xml brokers are shutdown at test end
Modified:
activemq/trunk/activemq-spring/src/test/java/org/apache/bugs/LoadBalanceTest.java
activemq/trunk/activemq-spring/src/test/resources/org/apache/bugs/loadbalancetest.xml
Modified:
activemq/trunk/activemq-spring/src/test/java/org/apache/bugs/LoadBalanceTest.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-spring/src/test/java/org/apache/bugs/LoadBalanceTest.java?rev=1159818&r1=1159817&r2=1159818&view=diff
==============================================================================
---
activemq/trunk/activemq-spring/src/test/java/org/apache/bugs/LoadBalanceTest.java
(original)
+++
activemq/trunk/activemq-spring/src/test/java/org/apache/bugs/LoadBalanceTest.java
Fri Aug 19 23:40:42 2011
@@ -311,6 +311,12 @@ public class LoadBalanceTest {
+ " and broker2 got "
+ broker2Count.get());
}
+
+
+ BrokerService broker = BrokerRegistry.getInstance().lookup("one");
+ broker.stop();
+ broker = BrokerRegistry.getInstance().lookup("two");
+ broker.stop();
}
// need to ensure broker bridge is alive before starting the consumer
Modified:
activemq/trunk/activemq-spring/src/test/resources/org/apache/bugs/loadbalancetest.xml
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-spring/src/test/resources/org/apache/bugs/loadbalancetest.xml?rev=1159818&r1=1159817&r2=1159818&view=diff
==============================================================================
---
activemq/trunk/activemq-spring/src/test/resources/org/apache/bugs/loadbalancetest.xml
(original)
+++
activemq/trunk/activemq-spring/src/test/resources/org/apache/bugs/loadbalancetest.xml
Fri Aug 19 23:40:42 2011
@@ -18,7 +18,9 @@
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:amq="http://activemq.apache.org/schema/core";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns:context="http://www.springframework.org/schema/context";
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+ http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-3.0.xsd
http://activemq.apache.org/schema/core
http://activemq.apache.org/schema/core/activemq-core.xsd";>
<!-- Allows us to use system properties as variables in this
configuration file -->
@@ -27,7 +29,9 @@
<value>SYSTEM_PROPERTIES_MODE_OVERRIDE</value>
</property>
</bean>
-
+
+ <context:annotation-config />
+
<!-- Configures a broker with the system's hostname as its name with
jmx but no persistence or adivsory support -->
<amq:broker brokerName="${lbt.brokerName}" useJmx="false"
persistent="false" advisorySupport="true" useLocalHostBrokerName="false">
