activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbert...@apache.org
Subject [1/2] activemq-artemis git commit: ARTEMIS-1352 Fixing test on Auto created address
Date Tue, 03 Oct 2017 16:57:10 GMT
Repository: activemq-artemis
Updated Branches:
  refs/heads/master 0cb63fb88 -> 49e4f0941


ARTEMIS-1352 Fixing test on Auto created address


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

Branch: refs/heads/master
Commit: 02b305b02a5325be1d39bde1f7cf9901f8354db6
Parents: 0cb63fb
Author: Clebert Suconic <clebertsuconic@apache.org>
Authored: Tue Oct 3 11:48:00 2017 -0400
Committer: Clebert Suconic <clebertsuconic@apache.org>
Committed: Tue Oct 3 11:59:42 2017 -0400

----------------------------------------------------------------------
 .../amqp/proton/ProtonServerReceiverContext.java    |  2 +-
 .../tests/integration/mqtt/imported/MQTTTest.java   | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/02b305b0/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonServerReceiverContext.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonServerReceiverContext.java
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonServerReceiverContext.java
index eee35a6..bcab2ea 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonServerReceiverContext.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonServerReceiverContext.java
@@ -125,7 +125,7 @@ public class ProtonServerReceiverContext extends ProtonInitializable implements
                } catch (ActiveMQAMQPNotFoundException e) {
                   throw e;
                } catch (Exception e) {
-                  e.printStackTrace();
+                  log.debug(e.getMessage(), e);
                   throw new ActiveMQAMQPInternalErrorException(e.getMessage(), e);
                }
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/02b305b0/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTest.java
index 9338384..6311058 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTest.java
@@ -1135,6 +1135,14 @@ public class MQTTTest extends MQTTTestSupport {
 
    @Test(timeout = 60 * 1000)
    public void testLinkRouteAmqpReceiveMQTT() throws Exception {
+
+      MQTT mqtt = createMQTTConnection();
+      mqtt.setClientId("TestClient");
+      BlockingConnection blockingConnection = mqtt.blockingConnection();
+      blockingConnection.connect();
+      Topic t = new Topic("test", QoS.AT_LEAST_ONCE);
+      blockingConnection.subscribe(new Topic[]{t});
+
       AmqpClient client = new AmqpClient(new URI(AMQP_URI), null, null);
       AmqpConnection connection = client.connect();
 
@@ -1149,13 +1157,8 @@ public class MQTTTest extends MQTTTestSupport {
          connection.close();
       }
 
-      MQTT mqtt = createMQTTConnection();
-      mqtt.setClientId("TestClient");
-      BlockingConnection blockingConnection = mqtt.blockingConnection();
       try {
-         blockingConnection.connect();
-         Topic t = new Topic("test", QoS.AT_LEAST_ONCE);
-         blockingConnection.subscribe(new Topic[] {t});
+         blockingConnection.subscribe(new Topic[]{t});
          assertNotNull(blockingConnection.receive(5, TimeUnit.SECONDS));
       } finally {
          blockingConnection.kill();
@@ -1900,7 +1903,6 @@ public class MQTTTest extends MQTTTestSupport {
          getServer().waitForActivation(10, TimeUnit.SECONDS);
       }
 
-
    }
 
    @Test


Mime
View raw message