Ensure all resources shut down.
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/58be7125 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/58be7125 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/58be7125 Branch: refs/heads/activemq-5.10.x Commit: 58be7125d48efdba29f05debe77ee59e0c64eef1 Parents: 2193ef1 Author: Timothy Bish <[email protected]> Authored: Mon Aug 18 17:58:58 2014 -0400 Committer: Hadrian Zbarcea <[email protected]> Committed: Wed Dec 17 19:46:50 2014 -0500 ---------------------------------------------------------------------- .../activemq/transport/ws/WSTransportTest.java | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/58be7125/activemq-http/src/test/java/org/apache/activemq/transport/ws/WSTransportTest.java ---------------------------------------------------------------------- diff --git a/activemq-http/src/test/java/org/apache/activemq/transport/ws/WSTransportTest.java b/activemq-http/src/test/java/org/apache/activemq/transport/ws/WSTransportTest.java index 6c99328..b133e71 100644 --- a/activemq-http/src/test/java/org/apache/activemq/transport/ws/WSTransportTest.java +++ b/activemq-http/src/test/java/org/apache/activemq/transport/ws/WSTransportTest.java @@ -17,6 +17,8 @@ package org.apache.activemq.transport.ws; +import static org.junit.Assert.assertTrue; + import java.io.File; import java.io.IOException; import java.net.Socket; @@ -47,8 +49,6 @@ import org.openqa.selenium.firefox.FirefoxProfile; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.Assert.assertTrue; - public class WSTransportTest { private static final Logger LOG = LoggerFactory.getLogger(WSTransportTest.class); @@ -137,13 +137,21 @@ public class WSTransportTest { } catch(Exception e) { // Some tests explicitly disconnect from stomp so can ignore } finally { - stopBroker(); + try { + stopBroker(); + } catch (Exception e) { + LOG.warn("Error on Broker stop."); + } if (driver != null) { - driver.quit(); + try { + driver.quit(); + } catch (Exception e) {} driver = null; } if (server != null) { - server.stop(); + try { + server.stop(); + } catch (Exception e) {} } } } @@ -250,6 +258,7 @@ public class WSTransportTest { assertTrue("Should have disconnected", Wait.waitFor(new Wait.Condition() { + @Override public boolean isSatisified() throws Exception { return webStatus.getText().equals("Disconnected"); }
