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 2016/12/15 02:10:38 UTC
[4/5] activemq-artemis git commit: ARTEMIS-789 fix ArtemisTest
ARTEMIS-789 fix ArtemisTest
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/10a32481
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/10a32481
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/10a32481
Branch: refs/heads/master
Commit: 10a32481fd277f033dce666ccf4d142164fdbee2
Parents: 4424117
Author: jbertram <jb...@apache.org>
Authored: Wed Dec 14 19:46:53 2016 -0600
Committer: jbertram <jb...@apache.org>
Committed: Wed Dec 14 19:46:53 2016 -0600
----------------------------------------------------------------------
.../artemis/protocol/amqp/broker/AMQPSessionCallback.java | 2 +-
.../artemis/protocol/amqp/proton/ProtonServerSenderContext.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/10a32481/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java
index 8f7584b..d8c908c 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java
@@ -239,7 +239,7 @@ public class AMQPSessionCallback implements SessionCallback {
BindingQueryResult bindingQueryResult = serverSession.executeBindingQuery(SimpleString.toSimpleString(address));
if (!bindingQueryResult.isExists() && bindingQueryResult.isAutoCreateQueues()) {
try {
- serverSession.createQueue(new SimpleString(address), new SimpleString(address), null, false, true);
+ serverSession.createQueue(new SimpleString(address), new SimpleString(address), RoutingType.ANYCAST, null, false, true);
} catch (ActiveMQQueueExistsException e) {
// The queue may have been created by another thread in the mean time. Catch and do nothing.
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/10a32481/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonServerSenderContext.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonServerSenderContext.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonServerSenderContext.java
index 530d1b9..79f49bf 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonServerSenderContext.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonServerSenderContext.java
@@ -251,9 +251,9 @@ public class ProtonServerSenderContext extends ProtonInitializable implements Pr
Set<RoutingType> routingTypes = addressInfo.getRoutingTypes();
//if the client defines 1 routing type and the broker another then throw an exception
if (multicast && !routingTypes.contains(RoutingType.MULTICAST)) {
- throw new ActiveMQAMQPIllegalStateException("Address is not configured for topic support");
+ throw new ActiveMQAMQPIllegalStateException("Address " + addressInfo.getName() + " is not configured for topic support");
} else if (!multicast && !routingTypes.contains(RoutingType.ANYCAST)) {
- throw new ActiveMQAMQPIllegalStateException("Address is not configured for queue support");
+ throw new ActiveMQAMQPIllegalStateException("Address " + addressInfo.getName() + " is not configured for queue support");
}
} else {
//if not we look up the address