From 25fd0b98afe9fc95417ac71b6aff499698cef4f6 Mon Sep 17 00:00:00 2001 From: wenshao Date: Tue, 12 Jul 2011 08:51:05 +0000 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81numTestsPerEvictionRun?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://code.alibabatech.com/svn/druid/trunk@380 b9813039-fb51-4c41-a8b9-e21c2acb5095 --- src/main/java/com/alibaba/druid/pool/DruidDataSource.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java index c694aed77f..b9b22fb583 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -661,9 +661,10 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat continue FOR_0; } - long millis = System.currentTimeMillis() - first.getLastActiveMillis(); - if (millis < minEvictableIdleTimeMillis) { - idleTimeout.await(millis, TimeUnit.MILLISECONDS); + long idleMillis = System.currentTimeMillis() - first.getLastActiveMillis(); + if (idleMillis < minEvictableIdleTimeMillis) { + long waitMillis = minEvictableIdleTimeMillis - idleMillis; + idleTimeout.await(waitMillis, TimeUnit.MILLISECONDS); continue FOR_0; }