From d61ca69b64d178c19de8a78dfa03662fcb45f14e Mon Sep 17 00:00:00 2001
From: Clebert Suconic <clebertsuconic@apache.org>
Date: Wed, 21 Dec 2016 12:15:14 -0500
Subject: [PATCH] NO-JIRA fixing checkstyle and tearDown on a test

---
 .../artemis/tests/integration/openwire/BasicOpenWireTest.java   | 1 +
 .../integration/openwire/interop/CompressedInteropTest.java     | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

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 66805d1d28..c570414f24 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) {
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 337027be5e..ada2e55397 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;