You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2017/10/03 16:57:10 UTC
[1/2] activemq-artemis git commit: ARTEMIS-1352 Fixing test on Auto
created address
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 <cl...@apache.org>
Authored: Tue Oct 3 11:48:00 2017 -0400
Committer: Clebert Suconic <cl...@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
[2/2] activemq-artemis git commit: This closes #1568
Posted by jb...@apache.org.
This closes #1568
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/49e4f094
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/49e4f094
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/49e4f094
Branch: refs/heads/master
Commit: 49e4f0941bb4d5824c3594253803fd07a2fce1cf
Parents: 0cb63fb 02b305b
Author: Justin Bertram <jb...@apache.org>
Authored: Tue Oct 3 11:56:54 2017 -0500
Committer: Justin Bertram <jb...@apache.org>
Committed: Tue Oct 3 11:56:54 2017 -0500
----------------------------------------------------------------------
.../amqp/proton/ProtonServerReceiverContext.java | 2 +-
.../tests/integration/mqtt/imported/MQTTTest.java | 16 +++++++++-------
2 files changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------