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 2017/01/12 17:22:25 UTC
[1/2] activemq-artemis git commit: ARTEMIS-918 - use requested
routing type when client defined with amqp and address doesnt exist
Repository: activemq-artemis
Updated Branches:
refs/heads/master a5f21fa6a -> c441625e5
ARTEMIS-918 - use requested routing type when client defined with amqp and address doesnt exist
https://issues.apache.org/jira/browse/ARTEMIS-918
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/f52cb5c6
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/f52cb5c6
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/f52cb5c6
Branch: refs/heads/master
Commit: f52cb5c610a0d15e924d4c36b0741414df1487d6
Parents: a5f21fa
Author: Andy Taylor <an...@gmail.com>
Authored: Thu Jan 12 12:07:10 2017 +0000
Committer: Andy Taylor <an...@gmail.com>
Committed: Thu Jan 12 12:07:16 2017 +0000
----------------------------------------------------------------------
.../amqp/proton/ProtonServerSenderContext.java | 2 +-
.../amqp/ClientDefinedMultiConsumerTest.java | 18 ++++++++++++++++++
2 files changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f52cb5c6/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 d287417..8d42fe9 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
@@ -246,7 +246,7 @@ public class ProtonServerSenderContext extends ProtonInitializable implements Pr
boolean clientDefined = hasCapabilities(TOPIC, source) || hasCapabilities(QUEUE, source);
if (clientDefined) {
multicast = hasCapabilities(TOPIC, source);
- AddressQueryResult addressQueryResult = sessionSPI.addressQuery(addressToUse.toString(), defaultRoutingType, true);
+ AddressQueryResult addressQueryResult = sessionSPI.addressQuery(addressToUse.toString(), multicast ? RoutingType.MULTICAST : RoutingType.ANYCAST, true);
if (!addressQueryResult.isExists()) {
throw ActiveMQAMQPProtocolMessageBundle.BUNDLE.sourceAddressDoesntExist();
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f52cb5c6/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/ClientDefinedMultiConsumerTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/ClientDefinedMultiConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/ClientDefinedMultiConsumerTest.java
index 9b5187f..f4643f0 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/ClientDefinedMultiConsumerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/ClientDefinedMultiConsumerTest.java
@@ -301,6 +301,24 @@ public class ClientDefinedMultiConsumerTest extends AmqpClientTestSupport {
connection.close();
}
+ @Test(timeout = 60000)
+ public void testAddressDoesntExist() throws Exception {
+ AmqpClient client = createAmqpClient();
+
+ AmqpConnection connection = addConnection(client.connect("myClientId"));
+ AmqpSession session = connection.createSession();
+ Source source = createNonSharedSource(TerminusDurability.CONFIGURATION);
+ Source source1 = createSharedSource(TerminusDurability.CONFIGURATION);
+ AmqpReceiver receiver = session.createMulticastReceiver(source, "myReceiverID", "mySub");
+ try {
+ session.createMulticastReceiver(source1, "myReceiverID", "mySub|2");
+ fail("Exception expected");
+ } catch (Exception e) {
+ //expected
+ }
+ connection.close();
+ }
+
private Source createNonSharedSource(TerminusDurability terminusDurability) {
Source source = new Source();
source.setAddress(address.toString());
[2/2] activemq-artemis git commit: This closes #958
Posted by cl...@apache.org.
This closes #958
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/c441625e
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/c441625e
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/c441625e
Branch: refs/heads/master
Commit: c441625e5ade0f4285c9258aba290c648646fe19
Parents: a5f21fa f52cb5c
Author: Clebert Suconic <cl...@apache.org>
Authored: Thu Jan 12 12:22:15 2017 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Jan 12 12:22:15 2017 -0500
----------------------------------------------------------------------
.../amqp/proton/ProtonServerSenderContext.java | 2 +-
.../amqp/ClientDefinedMultiConsumerTest.java | 18 ++++++++++++++++++
2 files changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------