From dd2ab8a75a87ba803ca2aad63eaa816ea0e3d018 Mon Sep 17 00:00:00 2001 From: wenshao Date: Fri, 2 Sep 2011 15:34:08 +0000 Subject: [PATCH] git-svn-id: http://code.alibabatech.com/svn/druid/trunk@573 b9813039-fb51-4c41-a8b9-e21c2acb5095 --- src/main/java/com/alibaba/druid/pool/DruidDataSource.java | 4 +--- 1 file changed, 1 insertion(+), 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 177ae15787..2db18cc461 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -534,9 +534,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat for (;;) { if (activeCount >= maxActive) { - long startNano = System.nanoTime(); - notMaxActive.awaitNanos(nanos); - nanos -= (System.nanoTime() - startNano); + nanos = notMaxActive.awaitNanos(nanos); } if (poolingCount == 0) {