commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r774576 - /commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/GenericObjectPool.java
Date Wed, 13 May 2009 22:44:48 GMT
Author: markt
Date: Wed May 13 22:44:48 2009
New Revision: 774576

URL: http://svn.apache.org/viewvc?rev=774576&view=rev
Log:
Fix POOL-135 for GOP.

Modified:
    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/GenericObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/GenericObjectPool.java?rev=774576&r1=774575&r2=774576&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 May 13 22:44:48 2009
@@ -1149,6 +1149,8 @@
                     } else {
                         _pool.addLast(new ObjectTimestampPair(obj));
                     }
+                    _numActive--;
+                    notifyAll();
                 }
             }
         }
@@ -1160,15 +1162,15 @@
             } catch(Exception e) {
                 // ignored
             }
-        }
-        
-        // Decrement active count *after* destroy if applicable
-        if (decrementNumActive) {
-            synchronized(this) {
-                _numActive--;
-                notifyAll();
+            // Decrement active count *after* destroy if applicable
+            if (decrementNumActive) {
+                synchronized(this) {
+                    _numActive--;
+                    notifyAll();
+                }
             }
         }
+        
     }
 
     public void close() throws Exception {



Mime
View raw message