From 4b2e1d9ea5076cfc5b9827b5241f54430b0ad196 Mon Sep 17 00:00:00 2001 From: Nitin Date: Thu, 26 Nov 2015 18:51:14 +0530 Subject: [PATCH] removed explicit use of iterator --- src/main/java/com/zaxxer/hikari/pool/HikariPool.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/zaxxer/hikari/pool/HikariPool.java b/src/main/java/com/zaxxer/hikari/pool/HikariPool.java index 05679c88..9e665dbf 100644 --- a/src/main/java/com/zaxxer/hikari/pool/HikariPool.java +++ b/src/main/java/com/zaxxer/hikari/pool/HikariPool.java @@ -20,7 +20,6 @@ import java.sql.Connection; import java.sql.SQLException; import java.sql.SQLTransientConnectionException; import java.util.Collections; -import java.util.Iterator; import java.util.List; import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; @@ -616,15 +615,14 @@ public class HikariPool extends PoolBase implements HikariPoolMXBean, IBagStateL if (removable > 0) { // Sort pool entries on lastAccessed Collections.sort(idleList, LASTACCESS_COMPARABLE); - // Iterate the first N removable elements - final Iterator iter = idleList.iterator(); - do { - final PoolEntry poolEntry = iter.next(); + for (PoolEntry poolEntry : idleList) { if (clockSource.elapsedMillis(poolEntry.lastAccessed, now) > idleTimeout && connectionBag.reserve(poolEntry)) { closeConnection(poolEntry, "(connection passed idleTimeout)"); - removable--; + if (--removable == 0) { + break; // keep min idle cons + }; } - } while (removable > 0 && iter.hasNext()); + } } }