From commits-return-15745-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org Fri Mar 18 14:54:12 2011 Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 94778 invoked from network); 18 Mar 2011 14:54:12 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 18 Mar 2011 14:54:12 -0000 Received: (qmail 37379 invoked by uid 500); 18 Mar 2011 14:54:12 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 37326 invoked by uid 500); 18 Mar 2011 14:54:11 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 37313 invoked by uid 99); 18 Mar 2011 14:54:10 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Mar 2011 14:54:10 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Mar 2011 14:54:08 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 06E6C23888E7; Fri, 18 Mar 2011 14:53:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1082939 - in /activemq/trunk/activemq-core: pom.xml src/main/java/org/apache/activemq/broker/region/Queue.java Date: Fri, 18 Mar 2011 14:53:44 -0000 To: commits@activemq.apache.org From: dejanb@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110318145345.06E6C23888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 @@ **/perf/SimpleDurableTopicTest.* - - - **/TransactionNotStartedErrorTest.* **/DefaultStoreBrokerTest.* 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);