remove the 'amqp:multi-txns-per-ssn' capability from coordinator links since we don't currently use this, update test to verify the exact capabilities we request
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/b3ef44d1 Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/b3ef44d1 Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/b3ef44d1 Branch: refs/heads/master Commit: b3ef44d10e14053f65df5f8b27b9e7d8d251c4a8 Parents: 1ce194b Author: Robert Gemmell <[email protected]> Authored: Fri Nov 14 16:45:56 2014 +0000 Committer: Robert Gemmell <[email protected]> Committed: Fri Nov 14 16:45:56 2014 +0000 ---------------------------------------------------------------------- .../apache/qpid/jms/provider/amqp/AmqpTransactionContext.java | 2 +- .../qpid/jms/integration/ConnectionIntegrationTest.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/b3ef44d1/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpTransactionContext.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpTransactionContext.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpTransactionContext.java index a138c97..13b181e 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpTransactionContext.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpTransactionContext.java @@ -131,7 +131,7 @@ public class AmqpTransactionContext extends AmqpAbstractResource<JmsSessionInfo, @Override protected void doOpen() { Coordinator coordinator = new Coordinator(); - coordinator.setCapabilities(TxnCapability.LOCAL_TXN, TxnCapability.MULTI_TXNS_PER_SSN); + coordinator.setCapabilities(TxnCapability.LOCAL_TXN); Source source = new Source(); String coordinatorName = resource.getSessionId().toString(); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/b3ef44d1/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConnectionIntegrationTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConnectionIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConnectionIntegrationTest.java index 38269bc..7fe6b3f 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConnectionIntegrationTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConnectionIntegrationTest.java @@ -20,9 +20,9 @@ */ package org.apache.qpid.jms.integration; +import static org.hamcrest.Matchers.arrayContaining; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import static org.hamcrest.Matchers.instanceOf; import javax.jms.Connection; import javax.jms.ConnectionMetaData; @@ -31,7 +31,7 @@ import javax.jms.Session; import org.apache.qpid.jms.test.QpidJmsTestCase; import org.apache.qpid.jms.test.testpeer.TestAmqpPeer; import org.apache.qpid.jms.test.testpeer.matchers.CoordinatorMatcher; -import org.apache.qpid.proton.amqp.Symbol; +import org.apache.qpid.proton.amqp.transaction.TxnCapability; import org.junit.Test; // TODO find a way to make the test abort immediately if the TestAmqpPeer throws an exception @@ -64,8 +64,9 @@ public class ConnectionIntegrationTest extends QpidJmsTestCase { testPeer.expectBegin(true); // Expect the session, with an immediate link to the transaction coordinator + // using a target with the expected capabilities only. CoordinatorMatcher txCoordinatorMatcher = new CoordinatorMatcher(); - txCoordinatorMatcher.withCapabilities(instanceOf(Symbol[].class)); + txCoordinatorMatcher.withCapabilities(arrayContaining(TxnCapability.LOCAL_TXN)); testPeer.expectSenderAttach(txCoordinatorMatcher, false, false); Session session = connection.createSession(true, Session.SESSION_TRANSACTED); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
