commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
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 GMT
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();



Mime
View raw message