Return-Path: Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: (qmail 39834 invoked from network); 1 Apr 2009 16:46:00 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 1 Apr 2009 16:46:00 -0000 Received: (qmail 49589 invoked by uid 500); 1 Apr 2009 16:46:00 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 49484 invoked by uid 500); 1 Apr 2009 16:46:00 -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 49475 invoked by uid 99); 1 Apr 2009 16:46:00 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Apr 2009 16:46:00 +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; Wed, 01 Apr 2009 16:45:58 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0B383238896D; Wed, 1 Apr 2009 16:45:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r760960 - in /commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl: GenericKeyedObjectPool.java GenericObjectPool.java Date: Wed, 01 Apr 2009 16:45:36 -0000 To: commits@commons.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090401164537.0B383238896D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Wed Apr 1 16:45:35 2009 New Revision: 760960 URL: http://svn.apache.org/viewvc?rev=760960&view=rev Log: POOL-122. Reduce scope of fix to just OOME. 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=760960&r1=760959&r2=760960&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 Wed Apr 1 16:45:35 2009 @@ -1759,10 +1759,10 @@ evict(); } catch(Exception e) { // ignored - } catch(Throwable t) { + } catch(OutOfMemoryError oome) { // Log problem but give evictor thread a chance to continue in // case error is recoverable - t.printStackTrace(System.err); + oome.printStackTrace(System.err); } //Re-create the connections. try { 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=760960&r1=760959&r2=760960&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 Wed Apr 1 16:45:35 2009 @@ -1348,10 +1348,10 @@ evict(); } catch(Exception e) { // ignored - } catch(Throwable t) { + } catch(OutOfMemoryError oome) { // Log problem but give evictor thread a chance to continue in // case error is recoverable - t.printStackTrace(System.err); + oome.printStackTrace(System.err); } try { ensureMinIdle();