Repository: activemq-artemis Updated Branches: refs/heads/master 66b24d16c -> d61ca69b6
NO-JIRA fixing checkstyle and tearDown on a test Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/d61ca69b Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/d61ca69b Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/d61ca69b Branch: refs/heads/master Commit: d61ca69b64d178c19de8a78dfa03662fcb45f14e Parents: 66b24d1 Author: Clebert Suconic <clebertsuco...@apache.org> Authored: Wed Dec 21 12:15:14 2016 -0500 Committer: Clebert Suconic <clebertsuco...@apache.org> Committed: Wed Dec 21 12:15:14 2016 -0500 ---------------------------------------------------------------------- .../artemis/tests/integration/openwire/BasicOpenWireTest.java | 1 + .../tests/integration/openwire/interop/CompressedInteropTest.java | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d61ca69b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/BasicOpenWireTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/BasicOpenWireTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/BasicOpenWireTest.java index 66805d1..c570414 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/BasicOpenWireTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/BasicOpenWireTest.java @@ -95,6 +95,7 @@ public class BasicOpenWireTest extends OpenWireTestBase { @Override @After public void tearDown() throws Exception { + System.clearProperty("org.apache.activemq.transport.AbstractInactivityMonitor.keepAliveTime"); System.out.println("tear down! " + connection); try { if (connection != null) { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d61ca69b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/interop/CompressedInteropTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/interop/CompressedInteropTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/interop/CompressedInteropTest.java index 337027b..ada2e55 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/interop/CompressedInteropTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/interop/CompressedInteropTest.java @@ -28,9 +28,7 @@ import javax.jms.StreamMessage; import javax.jms.TextMessage; import java.nio.charset.StandardCharsets; -import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.ActiveMQMessageProducer; -import org.apache.activemq.ActiveMQXAConnectionFactory; import org.apache.activemq.artemis.tests.integration.openwire.BasicOpenWireTest; import org.apache.activemq.command.ActiveMQDestination; import org.junit.Before;