Repository: qpid-jms Updated Branches: refs/heads/master f4fcfab89 -> a6db6a001
QPIDJMS-331: have the connection desire the SHARED_SUBS capability Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/a6db6a00 Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/a6db6a00 Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/a6db6a00 Branch: refs/heads/master Commit: a6db6a001a094d4ff9505320f8827b2a69beb5bb Parents: ac5aab2 Author: Robbie Gemmell <[email protected]> Authored: Fri Sep 29 12:20:27 2017 +0100 Committer: Robbie Gemmell <[email protected]> Committed: Fri Sep 29 12:21:39 2017 +0100 ---------------------------------------------------------------------- .../qpid/jms/provider/amqp/builders/AmqpConnectionBuilder.java | 5 +++-- .../java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/a6db6a00/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/builders/AmqpConnectionBuilder.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/builders/AmqpConnectionBuilder.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/builders/AmqpConnectionBuilder.java index 5eebadb..def9c0c 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/builders/AmqpConnectionBuilder.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/builders/AmqpConnectionBuilder.java @@ -17,8 +17,9 @@ package org.apache.qpid.jms.provider.amqp.builders; import static org.apache.qpid.jms.provider.amqp.AmqpSupport.ANONYMOUS_RELAY; -import static org.apache.qpid.jms.provider.amqp.AmqpSupport.SOLE_CONNECTION_CAPABILITY; import static org.apache.qpid.jms.provider.amqp.AmqpSupport.DELAYED_DELIVERY; +import static org.apache.qpid.jms.provider.amqp.AmqpSupport.SHARED_SUBS; +import static org.apache.qpid.jms.provider.amqp.AmqpSupport.SOLE_CONNECTION_CAPABILITY; import java.net.URI; import java.util.ArrayList; @@ -118,7 +119,7 @@ public class AmqpConnectionBuilder extends AmqpResourceBuilder<AmqpConnection, A Connection connection = getParent().getProtonConnection(); connection.setHostname(hostname); connection.setContainer(resourceInfo.getClientId()); - connection.setDesiredCapabilities(new Symbol[] { SOLE_CONNECTION_CAPABILITY, DELAYED_DELIVERY, ANONYMOUS_RELAY}); + connection.setDesiredCapabilities(new Symbol[] { SOLE_CONNECTION_CAPABILITY, DELAYED_DELIVERY, ANONYMOUS_RELAY, SHARED_SUBS}); connection.setProperties(props); return connection; http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/a6db6a00/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java index 64cb2c6..89c78d9 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java @@ -23,6 +23,7 @@ import static org.apache.qpid.jms.provider.amqp.AmqpSupport.DELAYED_DELIVERY; import static org.apache.qpid.jms.provider.amqp.AmqpSupport.DYNAMIC_NODE_LIFETIME_POLICY; import static org.apache.qpid.jms.provider.amqp.AmqpSupport.GLOBAL; import static org.apache.qpid.jms.provider.amqp.AmqpSupport.SHARED; +import static org.apache.qpid.jms.provider.amqp.AmqpSupport.SHARED_SUBS; import static org.apache.qpid.jms.provider.amqp.AmqpSupport.SOLE_CONNECTION_CAPABILITY; import static org.hamcrest.MatcherAssert.assertThat; @@ -143,7 +144,7 @@ public class TestAmqpPeer implements AutoCloseable private static final UnsignedByte SASL_FAIL_AUTH = UnsignedByte.valueOf((byte)1); private static final int CONNECTION_CHANNEL = 0; private static final int DEFAULT_PRODUCER_CREDIT = 100; - private static final Symbol[] DEFAULT_DESIRED_CAPABILITIES = new Symbol[] { SOLE_CONNECTION_CAPABILITY, DELAYED_DELIVERY, ANONYMOUS_RELAY}; + private static final Symbol[] DEFAULT_DESIRED_CAPABILITIES = new Symbol[] { SOLE_CONNECTION_CAPABILITY, DELAYED_DELIVERY, ANONYMOUS_RELAY, SHARED_SUBS}; private volatile AssertionError _firstAssertionError = null; private final TestAmqpPeerRunner _driverRunnable; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
