Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 12012 invoked from network); 10 Mar 2008 14:17:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 10 Mar 2008 14:17:15 -0000 Received: (qmail 25858 invoked by uid 500); 10 Mar 2008 14:17:12 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 25802 invoked by uid 500); 10 Mar 2008 14:17: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 25793 invoked by uid 99); 10 Mar 2008 14:17:11 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Mar 2008 07:17:11 -0700 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.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Mar 2008 14:16:31 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1F2D81A9832; Mon, 10 Mar 2008 07:16:52 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r635565 - /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/state/ConnectionStateTracker.java Date: Mon, 10 Mar 2008 14:16:51 -0000 To: commits@activemq.apache.org From: rajdavies@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080310141652.1F2D81A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rajdavies Date: Mon Mar 10 07:16:49 2008 New Revision: 635565 URL: http://svn.apache.org/viewvc?rev=635565&view=rev Log: Fix problem in message state tracker that will result on OME Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/state/ConnectionStateTracker.java Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/state/ConnectionStateTracker.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/state/ConnectionStateTracker.java?rev=635565&r1=635564&r2=635565&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/state/ConnectionStateTracker.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/state/ConnectionStateTracker.java Mon Mar 10 07:16:49 2008 @@ -63,7 +63,9 @@ private Map messageCache = new LinkedHashMap(){ protected boolean removeEldestEntry(Map.Entry eldest) { boolean result = currentCacheSize > maxCacheSize; - currentCacheSize -= eldest.getValue().getSize(); + if (result) { + currentCacheSize -= eldest.getValue().getSize(); + } return result; } }; @@ -104,7 +106,7 @@ if (trackMessages && command != null && command.isMessage()) { Message message = (Message) command; if (message.getTransactionId()==null) { - currentCacheSize+=message.getSize(); + currentCacheSize = currentCacheSize + message.getSize(); } } }