Return-Path: Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: (qmail 90316 invoked from network); 14 May 2009 07:35:20 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 14 May 2009 07:35:20 -0000 Received: (qmail 48512 invoked by uid 500); 14 May 2009 07:35:20 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 48395 invoked by uid 500); 14 May 2009 07:35:20 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 48386 invoked by uid 99); 14 May 2009 07:35:20 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 May 2009 07:35:20 +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; Thu, 14 May 2009 07:35:18 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BBFBC238888D; Thu, 14 May 2009 07:34:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r774668 - in /commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl: GenericKeyedObjectPool.java GenericObjectPool.java Date: Thu, 14 May 2009 07:34:57 -0000 To: commits@commons.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090514073457.BBFBC238888D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Thu May 14 07:34:57 2009 New Revision: 774668 URL: http://svn.apache.org/viewvc?rev=774668&view=rev Log: Correct patch for POOL-135. Only decrement _numActive when flag is set Modified: commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/GenericKeyedObjectPool.java commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/GenericObjectPool.java Modified: commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/GenericKeyedObjectPool.java URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/GenericKeyedObjectPool.java?rev=774668&r1=774667&r2=774668&view=diff ============================================================================== --- commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/GenericKeyedObjectPool.java (original) +++ commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/GenericKeyedObjectPool.java Thu May 14 07:34:57 2009 @@ -1298,7 +1298,9 @@ pool.queue.addLast(new ObjectTimestampPair(obj)); } _totalIdle++; - pool.decrementActiveCount(); + if (decrementNumActive) { + pool.decrementActiveCount(); + } notifyAll(); } } Modified: commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/GenericObjectPool.java URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/GenericObjectPool.java?rev=774668&r1=774667&r2=774668&view=diff ============================================================================== --- commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/GenericObjectPool.java (original) +++ commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/GenericObjectPool.java Thu May 14 07:34:57 2009 @@ -1149,7 +1149,9 @@ } else { _pool.addLast(new ObjectTimestampPair(obj)); } - _numActive--; + if (decrementNumActive) { + _numActive--; + } notifyAll(); } }