Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 57588 invoked from network); 22 Jun 2009 19:07:55 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 22 Jun 2009 19:07:55 -0000 Received: (qmail 36838 invoked by uid 500); 22 Jun 2009 19:08:06 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 36790 invoked by uid 500); 22 Jun 2009 19:08:06 -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 36781 invoked by uid 99); 22 Jun 2009 19:08:06 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Jun 2009 19:08:06 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Mon, 22 Jun 2009 19:08:04 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9B2352388891; Mon, 22 Jun 2009 19:07:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r787351 - /activemq/sandbox/activemq-flow/activemq-queue/src/main/java/org/apache/activemq/queue/CursoredQueue.java Date: Mon, 22 Jun 2009 19:07:44 -0000 To: commits@activemq.apache.org From: cmacnaug@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090622190744.9B2352388891@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cmacnaug Date: Mon Jun 22 19:07:44 2009 New Revision: 787351 URL: http://svn.apache.org/viewvc?rev=787351&view=rev Log: Fixing CursoredQueue Expirator infinite loop (caused by expired element not being removed from the list) Modified: activemq/sandbox/activemq-flow/activemq-queue/src/main/java/org/apache/activemq/queue/CursoredQueue.java Modified: activemq/sandbox/activemq-flow/activemq-queue/src/main/java/org/apache/activemq/queue/CursoredQueue.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-queue/src/main/java/org/apache/activemq/queue/CursoredQueue.java?rev=787351&r1=787350&r2=787351&view=diff ============================================================================== --- activemq/sandbox/activemq-flow/activemq-queue/src/main/java/org/apache/activemq/queue/CursoredQueue.java (original) +++ activemq/sandbox/activemq-flow/activemq-queue/src/main/java/org/apache/activemq/queue/CursoredQueue.java Mon Jun 22 19:07:44 2009 @@ -1253,6 +1253,7 @@ for (QueueElement qe : first.getValue()) { qe.releaseSoftRef(); qe.acknowledge(); + expirationCache.remove(first.getKey()); } } }