Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 664A9411C for ; Fri, 13 May 2011 09:45:56 +0000 (UTC) Received: (qmail 3238 invoked by uid 500); 13 May 2011 09:45:56 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 3188 invoked by uid 500); 13 May 2011 09:45:55 -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 3181 invoked by uid 99); 13 May 2011 09:45:55 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 May 2011 09:45:55 +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, 13 May 2011 09:45:54 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8245F2388901; Fri, 13 May 2011 09:45:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1102632 - /activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Queue.scala Date: Fri, 13 May 2011 09:45:34 -0000 To: commits@activemq.apache.org From: chirino@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110513094534.8245F2388901@eris.apache.org> Author: chirino Date: Fri May 13 09:45:34 2011 New Revision: 1102632 URL: http://svn.apache.org/viewvc?rev=1102632&view=rev Log: Don't depend on assert executing the test since it might get elided away. Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Queue.scala Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Queue.scala URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Queue.scala?rev=1102632&r1=1102631&r2=1102632&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Queue.scala (original) +++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Queue.scala Fri May 13 09:45:34 2011 @@ -1080,7 +1080,8 @@ class QueueEntry(val queue:Queue, val se queue.ack_source.merge((acquiredQueueEntry, consumed, tx)) } - assert(sub.offer(acquiredDelivery), "sub should have accepted, it had reported not full earlier.") + val accepted = sub.offer(acquiredDelivery) + assert(accepted, "sub should have accepted, it had reported not full earlier.") } } }