Repository: qpid-jms Updated Branches: refs/heads/master 2ba63c4b4 -> 9807177b9
QPIDJMS-284: only include the capability when the link is also for a shared subscription Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/9807177b Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/9807177b Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/9807177b Branch: refs/heads/master Commit: 9807177b97bc0f005b767d29fa330486add10f48 Parents: 2ba63c4 Author: Robert Gemmell <[email protected]> Authored: Thu Apr 6 18:18:34 2017 +0100 Committer: Robert Gemmell <[email protected]> Committed: Thu Apr 6 18:18:34 2017 +0100 ---------------------------------------------------------------------- .../amqp/builders/AmqpConsumerBuilder.java | 6 ++-- .../jms/integration/SessionIntegrationTest.java | 32 ++++++++++++++++---- 2 files changed, 29 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9807177b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/builders/AmqpConsumerBuilder.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/builders/AmqpConsumerBuilder.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/builders/AmqpConsumerBuilder.java index e9a54b8..dbaf83f 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/builders/AmqpConsumerBuilder.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/builders/AmqpConsumerBuilder.java @@ -228,10 +228,10 @@ public class AmqpConsumerBuilder extends AmqpResourceBuilder<AmqpConsumer, AmqpS if(resourceInfo.isShared()) { capabilities.add(AmqpSupport.SHARED); - } - if(!resourceInfo.isExplicitClientID()) { - capabilities.add(AmqpSupport.GLOBAL); + if(!resourceInfo.isExplicitClientID()) { + capabilities.add(AmqpSupport.GLOBAL); + } } if(!capabilities.isEmpty()) { http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9807177b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java index 843e7f1..e9f3e53 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java @@ -813,27 +813,47 @@ public class SessionIntegrationTest extends QpidJmsTestCase { @Test(timeout = 20000) public void testCreateConsumerSourceContainsQueueCapability() throws Exception { - doCreateConsumerSourceContainsCapabilityTestImpl(Queue.class); + doCreateConsumerSourceContainsCapabilityTestImpl(Queue.class, true); + } + + @Test(timeout = 20000) + public void testCreateConsumerSourceContainsQueueCapabilityWithoutClientID() throws Exception { + doCreateConsumerSourceContainsCapabilityTestImpl(Queue.class, false); } @Test(timeout = 20000) public void testCreateConsumerSourceContainsTopicCapability() throws Exception { - doCreateConsumerSourceContainsCapabilityTestImpl(Topic.class); + doCreateConsumerSourceContainsCapabilityTestImpl(Topic.class, true); + } + + @Test(timeout = 20000) + public void testCreateConsumerSourceContainsTopicCapabilityWithoutClientID() throws Exception { + doCreateConsumerSourceContainsCapabilityTestImpl(Topic.class, false); } @Test(timeout = 20000) public void testCreateConsumerSourceContainsTempQueueCapability() throws Exception { - doCreateConsumerSourceContainsCapabilityTestImpl(TemporaryQueue.class); + doCreateConsumerSourceContainsCapabilityTestImpl(TemporaryQueue.class, true); + } + + @Test(timeout = 20000) + public void testCreateConsumerSourceContainsTempQueueCapabilityWithoutClientID() throws Exception { + doCreateConsumerSourceContainsCapabilityTestImpl(TemporaryQueue.class, false); } @Test(timeout = 20000) public void testCreateConsumerSourceContainsTempTopicCapability() throws Exception { - doCreateConsumerSourceContainsCapabilityTestImpl(TemporaryTopic.class); + doCreateConsumerSourceContainsCapabilityTestImpl(TemporaryTopic.class, true); + } + + @Test(timeout = 20000) + public void testCreateConsumerSourceContainsTempTopicCapabilityWithoutClientID() throws Exception { + doCreateConsumerSourceContainsCapabilityTestImpl(TemporaryTopic.class, false); } - private void doCreateConsumerSourceContainsCapabilityTestImpl(Class<? extends Destination> destType) throws JMSException, Exception, IOException { + private void doCreateConsumerSourceContainsCapabilityTestImpl(Class<? extends Destination> destType, boolean setClientID) throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { - Connection connection = testFixture.establishConnecton(testPeer); + Connection connection = testFixture.establishConnecton(testPeer, false, null, null, null, setClientID); testPeer.expectBegin(); Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
