disable client-side priority reordering by default
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/63643e75 Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/63643e75 Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/63643e75 Branch: refs/heads/master Commit: 63643e75e6d64c5126769d219e6c24242eb4d9c3 Parents: 4249b68 Author: Robert Gemmell <[email protected]> Authored: Fri Jan 16 15:59:41 2015 +0000 Committer: Robert Gemmell <[email protected]> Committed: Fri Jan 16 15:59:41 2015 +0000 ---------------------------------------------------------------------- .../main/java/org/apache/qpid/jms/JmsConnectionFactory.java | 6 +++--- .../qpid/jms/consumer/JmsConsumerPriorityDispatchTest.java | 5 ++++- .../qpid/jms/transactions/JmsTransactedConsumerTest.java | 4 +++- 3 files changed, 10 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/63643e75/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java index 1ec9213..4c3d3bf 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java @@ -60,7 +60,7 @@ public class JmsConnectionFactory extends JNDIStorable implements ConnectionFact private boolean alwaysSyncSend; private boolean sendAcksAsync; private boolean omitHost; - private boolean messagePrioritySupported = true; + private boolean messagePrioritySupported = false; private String queuePrefix = null; private String topicPrefix = null; private long sendTimeout = JmsConnectionInfo.DEFAULT_SEND_TIMEOUT; @@ -423,8 +423,8 @@ public class JmsConnectionFactory extends JNDIStorable implements ConnectionFact } /** - * Enables message priority support in MessageConsumer instances. This results - * in all prefetched messages being dispatched in priority order. + * Enables client-side message priority support in MessageConsumer instances. + * This results in all prefetched messages being dispatched in priority order. * * @param messagePrioritySupported the messagePrioritySupported to set */ http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/63643e75/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsConsumerPriorityDispatchTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsConsumerPriorityDispatchTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsConsumerPriorityDispatchTest.java index cee54d3..27f290c 100644 --- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsConsumerPriorityDispatchTest.java +++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsConsumerPriorityDispatchTest.java @@ -17,6 +17,7 @@ package org.apache.qpid.jms.consumer; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import java.util.concurrent.TimeUnit; @@ -41,6 +42,7 @@ public class JmsConsumerPriorityDispatchTest extends AmqpTestSupport { @Test(timeout = 60000) public void testPrefetchedMessageArePriorityOrdered() throws Exception { connection = createAmqpConnection(); + ((JmsConnection) connection).setMessagePrioritySupported(true); connection.start(); Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); Queue queue = session.createQueue(name.getMethodName()); @@ -79,7 +81,8 @@ public class JmsConsumerPriorityDispatchTest extends AmqpTestSupport { // broker method in AmqpTestSupport. If that changes then this test will sometimes // fail. connection = createAmqpConnection(); - ((JmsConnection) connection).setMessagePrioritySupported(false); + assertFalse("Client side priority ordering expected to be disabled for this test", + ((JmsConnection) connection).isMessagePrioritySupported()); connection.start(); Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); Queue queue = session.createQueue(name.getMethodName()); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/63643e75/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/transactions/JmsTransactedConsumerTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/transactions/JmsTransactedConsumerTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/transactions/JmsTransactedConsumerTest.java index a6c2c43..3c5bb29 100644 --- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/transactions/JmsTransactedConsumerTest.java +++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/transactions/JmsTransactedConsumerTest.java @@ -32,6 +32,7 @@ import javax.jms.Session; import javax.jms.TextMessage; import org.apache.activemq.broker.jmx.QueueViewMBean; +import org.apache.qpid.jms.JmsConnection; import org.apache.qpid.jms.support.AmqpTestSupport; import org.apache.qpid.jms.support.QpidJmsTestSupport; import org.junit.Test; @@ -286,8 +287,9 @@ public class JmsTransactedConsumerTest extends AmqpTestSupport { } @Test(timeout=30000) - public void testSessionTransactedCommitWithPriorityReordering() throws Exception { + public void testSessionTransactedCommitWithLocalPriorityReordering() throws Exception { connection = createAmqpConnection(); + ((JmsConnection) connection).setMessagePrioritySupported(true); Session session = connection.createSession(true, Session.AUTO_ACKNOWLEDGE); Queue queue = session.createQueue(getDestinationName()); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
