You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by de...@apache.org on 2011/03/18 15:53:44 UTC
svn commit: r1082939 - in /activemq/trunk/activemq-core: pom.xml
src/main/java/org/apache/activemq/broker/region/Queue.java
Author: dejanb
Date: Fri Mar 18 14:53:44 2011
New Revision: 1082939
URL: http://svn.apache.org/viewvc?rev=1082939&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-3218 - exclusive consumer with highest priority should always get through
Modified:
activemq/trunk/activemq-core/pom.xml
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.java
Modified: activemq/trunk/activemq-core/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/pom.xml?rev=1082939&r1=1082938&r2=1082939&view=diff
==============================================================================
--- activemq/trunk/activemq-core/pom.xml (original)
+++ activemq/trunk/activemq-core/pom.xml Fri Mar 18 14:53:44 2011
@@ -417,9 +417,6 @@
</includes>
<excludes>
<exclude>**/perf/SimpleDurableTopicTest.*</exclude>
- </excludes>
- <excludes>
-
<!-- These tests run too slow to execute as part of the unit tests -->
<exclude>**/TransactionNotStartedErrorTest.*</exclude>
<exclude>**/DefaultStoreBrokerTest.*</exclude>
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.java?rev=1082939&r1=1082938&r2=1082939&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.java Fri Mar 18 14:53:44 2011
@@ -392,7 +392,8 @@ public class Queue extends BaseDestinati
Subscription exclusiveConsumer = dispatchSelector.getExclusiveConsumer();
if (exclusiveConsumer == null) {
exclusiveConsumer = sub;
- } else if (sub.getConsumerInfo().getPriority() > exclusiveConsumer.getConsumerInfo().getPriority()) {
+ } else if (sub.getConsumerInfo().getPriority() == Byte.MAX_VALUE ||
+ sub.getConsumerInfo().getPriority() > exclusiveConsumer.getConsumerInfo().getPriority()) {
exclusiveConsumer = sub;
}
dispatchSelector.setExclusiveConsumer(exclusiveConsumer);