You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2015/08/03 14:24:45 UTC

[2/5] activemq-artemis git commit: Ensure MQTT tests clean up SSL properties

Ensure MQTT tests clean up SSL properties


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/fe95e343
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/fe95e343
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/fe95e343

Branch: refs/heads/master
Commit: fe95e34390bb8156d3d09fd3a67c4112b0779a45
Parents: fc14e31
Author: jbertram <jb...@apache.org>
Authored: Thu Jul 30 09:26:16 2015 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Aug 3 08:24:28 2015 -0400

----------------------------------------------------------------------
 .../tests/integration/mqtt/imported/MQTTTestSupport.java       | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/fe95e343/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTestSupport.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTestSupport.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTestSupport.java
index fd802ec..36a2308 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTestSupport.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTestSupport.java
@@ -111,6 +111,12 @@ public class MQTTTestSupport extends ActiveMQTestBase
    @After
    public void tearDown() throws Exception
    {
+      System.clearProperty("javax.net.ssl.trustStore");
+      System.clearProperty("javax.net.ssl.trustStorePassword");
+      System.clearProperty("javax.net.ssl.trustStoreType");
+      System.clearProperty("javax.net.ssl.keyStore");
+      System.clearProperty("javax.net.ssl.keyStorePassword");
+      System.clearProperty("javax.net.ssl.keyStoreType");
       stopBroker();
    }