You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ma...@apache.org on 2013/11/26 21:38:28 UTC
svn commit: r1545828 -
/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
Author: markt
Date: Tue Nov 26 20:38:28 2013
New Revision: 1545828
URL: http://svn.apache.org/r1545828
Log:
Make call sequence consistent. No functional change.
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
Modified: commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java?rev=1545828&r1=1545827&r2=1545828&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java (original)
+++ commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java Tue Nov 26 20:38:28 2013
@@ -560,12 +560,12 @@ public class GenericObjectPool<T> extend
} catch (Exception e) {
swallowException(e);
}
- updateStatsReturn(activeTime);
try {
ensureIdle(1, false);
} catch (Exception e) {
swallowException(e);
}
+ updateStatsReturn(activeTime);
return;
}
}
@@ -870,7 +870,7 @@ public class GenericObjectPool<T> extend
void ensureMinIdle() throws Exception {
ensureIdle(getMinIdle(), true);
}
-
+
/**
* Tries to ensure that {@code idleCount} idle instances exist in the pool.
* <p>
@@ -878,7 +878,7 @@ public class GenericObjectPool<T> extend
* or the total number of objects (idle, checked out, or being created) reaches
* {@link #getMaxTotal()}. If {@code always} is false, no instances are created unless
* there are threads waiting to check out instances from the pool.
- *
+ *
* @param idleCount the number of idle instances desired
* @param always true means create instances even if the pool has no threads waiting
* @throws Exception if the factory's makeObject throws