You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by gt...@apache.org on 2017/05/26 10:49:26 UTC
activemq git commit: [no jira] tidy up test teardown - prevent
subsequent ci failures in error
Repository: activemq
Updated Branches:
refs/heads/master 25f112c5c -> 30d316298
[no jira] tidy up test teardown - prevent subsequent ci failures in error
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/30d31629
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/30d31629
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/30d31629
Branch: refs/heads/master
Commit: 30d31629824344b0322a9f09950b1612088ef12d
Parents: 25f112c
Author: gtully <ga...@gmail.com>
Authored: Fri May 26 11:49:04 2017 +0100
Committer: gtully <ga...@gmail.com>
Committed: Fri May 26 11:49:04 2017 +0100
----------------------------------------------------------------------
.../activemq/network/CompressionOverNetworkTest.java | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/30d31629/activemq-unit-tests/src/test/java/org/apache/activemq/network/CompressionOverNetworkTest.java
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/network/CompressionOverNetworkTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/network/CompressionOverNetworkTest.java
index c342eb2..3a2e5ec 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/network/CompressionOverNetworkTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/network/CompressionOverNetworkTest.java
@@ -265,10 +265,15 @@ public class CompressionOverNetworkTest {
}
protected void doTearDown() throws Exception {
- localConnection.close();
- remoteConnection.close();
- localBroker.stop();
- remoteBroker.stop();
+ try {
+ localConnection.close();
+ remoteConnection.close();
+ } catch (Exception ignored) {}
+ try {
+ localBroker.stop();
+ } finally {
+ remoteBroker.stop();
+ }
}
protected void doSetUp(boolean deleteAllMessages) throws Exception {