You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2015/01/27 18:31:55 UTC
qpid-jms git commit: rename option to better reflect its purpose
Repository: qpid-jms
Updated Branches:
refs/heads/master a82fd3ab2 -> e67c6ecda
rename option to better reflect its purpose
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/e67c6ecd
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/e67c6ecd
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/e67c6ecd
Branch: refs/heads/master
Commit: e67c6ecda89e2b7302ed64f3d6bb214009e6442f
Parents: a82fd3a
Author: Robert Gemmell <ro...@apache.org>
Authored: Tue Jan 27 17:16:02 2015 +0000
Committer: Robert Gemmell <ro...@apache.org>
Committed: Tue Jan 27 17:16:02 2015 +0000
----------------------------------------------------------------------
.../main/java/org/apache/qpid/jms/JmsConnection.java | 10 +++++-----
.../org/apache/qpid/jms/JmsConnectionFactory.java | 14 +++++++-------
.../java/org/apache/qpid/jms/JmsMessageConsumer.java | 2 +-
.../jms/consumer/JmsConsumerPriorityDispatchTest.java | 4 ++--
.../jms/transactions/JmsTransactedConsumerTest.java | 2 +-
5 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/e67c6ecd/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java
index cd7679b..1eaada5 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java
@@ -96,7 +96,7 @@ public class JmsConnection implements Connection, TopicConnection, QueueConnecti
private final Object connectLock = new Object();
private IOException firstFailureError;
private JmsPrefetchPolicy prefetchPolicy = new JmsPrefetchPolicy();
- private boolean messagePrioritySupported;
+ private boolean localMessagePriority;
private final ThreadPoolExecutor executor;
@@ -866,12 +866,12 @@ public class JmsConnection implements Connection, TopicConnection, QueueConnecti
this.prefetchPolicy = prefetchPolicy;
}
- public boolean isMessagePrioritySupported() {
- return messagePrioritySupported;
+ public boolean isLocalMessagePriority() {
+ return localMessagePriority;
}
- public void setMessagePrioritySupported(boolean messagePrioritySupported) {
- this.messagePrioritySupported = messagePrioritySupported;
+ public void setLocalMessagePriority(boolean localMessagePriority) {
+ this.localMessagePriority = localMessagePriority;
}
public long getCloseTimeout() {
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/e67c6ecd/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 eddc116..983c586 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
@@ -59,7 +59,7 @@ public class JmsConnectionFactory extends JNDIStorable implements ConnectionFact
private boolean alwaysSyncSend;
private boolean sendAcksAsync;
private boolean omitHost;
- private boolean messagePrioritySupported = false;
+ private boolean localMessagePriority;
private String queuePrefix = null;
private String topicPrefix = null;
private long sendTimeout = JmsConnectionInfo.DEFAULT_SEND_TIMEOUT;
@@ -394,20 +394,20 @@ public class JmsConnectionFactory extends JNDIStorable implements ConnectionFact
}
/**
- * @return the messagePrioritySupported configuration option.
+ * @return the localMessagePriority configuration option.
*/
- public boolean isMessagePrioritySupported() {
- return this.messagePrioritySupported;
+ public boolean isLocalMessagePriority() {
+ return this.localMessagePriority;
}
/**
* 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
+ * @param localMessagePriority the messagePrioritySupported to set
*/
- public void setMessagePrioritySupported(boolean messagePrioritySupported) {
- this.messagePrioritySupported = messagePrioritySupported;
+ public void setLocalMessagePriority(boolean localMessagePriority) {
+ this.localMessagePriority = localMessagePriority;
}
/**
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/e67c6ecd/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageConsumer.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageConsumer.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageConsumer.java
index eac2e11..9b358a2 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageConsumer.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageConsumer.java
@@ -95,7 +95,7 @@ public class JmsMessageConsumer implements MessageConsumer, JmsMessageAvailableC
connection.checkConsumeFromTemporaryDestination((JmsTemporaryDestination) destination);
}
- if (connection.isMessagePrioritySupported()) {
+ if (connection.isLocalMessagePriority()) {
this.messageQueue = new PriorityMessageQueue();
} else {
this.messageQueue = new FifoMessageQueue();
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/e67c6ecd/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 27f290c..70ac0bf 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
@@ -42,7 +42,7 @@ public class JmsConsumerPriorityDispatchTest extends AmqpTestSupport {
@Test(timeout = 60000)
public void testPrefetchedMessageArePriorityOrdered() throws Exception {
connection = createAmqpConnection();
- ((JmsConnection) connection).setMessagePrioritySupported(true);
+ ((JmsConnection) connection).setLocalMessagePriority(true);
connection.start();
Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
Queue queue = session.createQueue(name.getMethodName());
@@ -82,7 +82,7 @@ public class JmsConsumerPriorityDispatchTest extends AmqpTestSupport {
// fail.
connection = createAmqpConnection();
assertFalse("Client side priority ordering expected to be disabled for this test",
- ((JmsConnection) connection).isMessagePrioritySupported());
+ ((JmsConnection) connection).isLocalMessagePriority());
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/e67c6ecd/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 3c5bb29..07333ea 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
@@ -289,7 +289,7 @@ public class JmsTransactedConsumerTest extends AmqpTestSupport {
@Test(timeout=30000)
public void testSessionTransactedCommitWithLocalPriorityReordering() throws Exception {
connection = createAmqpConnection();
- ((JmsConnection) connection).setMessagePrioritySupported(true);
+ ((JmsConnection) connection).setLocalMessagePriority(true);
Session session = connection.createSession(true, Session.AUTO_ACKNOWLEDGE);
Queue queue = session.createQueue(getDestinationName());
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org