activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtu...@apache.org
Subject svn commit: r998015 - /activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/MasterSlaveProducerFlowControlTest.java
Date Fri, 17 Sep 2010 08:29:09 GMT
Author: gtully
Date: Fri Sep 17 08:29:08 2010
New Revision: 998015

URL: http://svn.apache.org/viewvc?rev=998015&view=rev
Log:
test that did not stop broker in teardown, schedualer db lock on startup shows it: https://issues.apache.org/activemq/browse/AMQ-2897

Modified:
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/MasterSlaveProducerFlowControlTest.java

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/MasterSlaveProducerFlowControlTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/MasterSlaveProducerFlowControlTest.java?rev=998015&r1=998014&r2=998015&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/MasterSlaveProducerFlowControlTest.java
(original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/MasterSlaveProducerFlowControlTest.java
Fri Sep 17 08:29:08 2010
@@ -27,12 +27,12 @@ import org.apache.commons.logging.LogFac
 
 public class MasterSlaveProducerFlowControlTest extends ProducerFlowControlTest {
     static final Log LOG = LogFactory.getLog(MasterSlaveProducerFlowControlTest.class);
-
+    BrokerService slave;
     protected BrokerService createBroker() throws Exception {
         BrokerService service = super.createBroker();
         service.start();
         
-        BrokerService slave = new BrokerService();
+        slave = new BrokerService();
         slave.setBrokerName("Slave");
         slave.setPersistent(false);
         slave.setUseJmx(false);
@@ -54,4 +54,11 @@ public class MasterSlaveProducerFlowCont
         slave.start();
         return service;
     }
+
+    protected void tearDown() throws Exception {
+        super.tearDown();
+        if (slave != null) {
+            slave.stop();
+        }
+    }
 }



Mime
View raw message