Repository: qpid-jms Updated Branches: refs/heads/master 568270b78 -> 5ebe40f01
Move Connection create to the test case and ensure proper cleanup Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/db522529 Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/db522529 Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/db522529 Branch: refs/heads/master Commit: db522529cba2e24007a0da50c85b74bd78567fc8 Parents: 568270b Author: Timothy Bish <tabish...@gmail.com> Authored: Fri Jan 16 17:33:29 2015 -0500 Committer: Timothy Bish <tabish...@gmail.com> Committed: Fri Jan 16 17:33:29 2015 -0500 ---------------------------------------------------------------------- .../jms/JmsConnectionConcurrentCloseCallsTest.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/db522529/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsConnectionConcurrentCloseCallsTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsConnectionConcurrentCloseCallsTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsConnectionConcurrentCloseCallsTest.java index 4bf4f73..8a5b31c 100644 --- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsConnectionConcurrentCloseCallsTest.java +++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsConnectionConcurrentCloseCallsTest.java @@ -26,7 +26,6 @@ import java.util.concurrent.TimeUnit; import javax.jms.Session; -import org.apache.qpid.jms.JmsConnection; import org.apache.qpid.jms.support.AmqpTestSupport; import org.junit.Test; @@ -41,15 +40,16 @@ public class JmsConnectionConcurrentCloseCallsTest extends AmqpTestSupport { super.setUp(); executor = Executors.newFixedThreadPool(20); - connection = (JmsConnection) createAmqpConnection(); - connection.start(); } @Override public void tearDown() throws Exception { - if (connection.isStarted()) { - connection.stop(); - } + try { + if (connection != null) { + connection.close(); + } + } catch (Exception ex) {} + if (executor != null) { executor.shutdownNow(); } @@ -59,6 +59,8 @@ public class JmsConnectionConcurrentCloseCallsTest extends AmqpTestSupport { @Test(timeout=200000) public void testCloseMultipleTimes() throws Exception { + connection = (JmsConnection) createAmqpConnection(); + connection.start(); connection.createSession(false, Session.AUTO_ACKNOWLEDGE); assertTrue(connection.isStarted()); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
