check for evicted should not depend on removable

pull/383/head
Nitin 10 years ago
parent 5004e1f463
commit 7685f10303

@ -634,7 +634,7 @@ public class HikariPool implements HikariPoolMXBean, IBagStateListener
final List<PoolBagEntry> bag = connectionBag.values(STATE_NOT_IN_USE);
int removable = bag.size() - config.getMinimumIdle();
for (PoolBagEntry bagEntry : bag) {
if (removable > 0 && (bagEntry.evicted || (idleTimeout > 0L && clockSource.elapsedMillis(bagEntry.lastAccess, now) > idleTimeout))) {
if (bagEntry.evicted || ((removable > 0 && idleTimeout > 0L && clockSource.elapsedMillis(bagEntry.lastAccess, now) > idleTimeout))) {
if (connectionBag.reserve(bagEntry)) {
closeConnection(bagEntry, "(connection passed idleTimeout)");
removable--;

Loading…
Cancel
Save