From d959babfcd64a1fecded3d307db0c89d6914bc05 Mon Sep 17 00:00:00 2001 From: wenshao Date: Mon, 5 Sep 2011 05:57:00 +0000 Subject: [PATCH] git-svn-id: http://code.alibabatech.com/svn/druid/trunk@640 b9813039-fb51-4c41-a8b9-e21c2acb5095 --- src/main/java/com/alibaba/druid/pool/DruidDataSource.java | 2 +- src/main/java/com/alibaba/druid/pool/DruidDataSourceMBean.java | 2 -- 2 files 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 e0a5c9ad91..c45965d8eb 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -651,7 +651,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat int waitThreadCount = lock.getWaitQueueLength(notEmpty); if (poolingCount - waitThreadCount >= 0) { - empty.await(1, TimeUnit.SECONDS); // 防止信号丢失引起的等待 + empty.await(3, TimeUnit.SECONDS); // 防止信号丢失引起的等待 continue; } diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSourceMBean.java b/src/main/java/com/alibaba/druid/pool/DruidDataSourceMBean.java index 4e4b9ce000..b623e17207 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSourceMBean.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSourceMBean.java @@ -22,8 +22,6 @@ public interface DruidDataSourceMBean extends DruidAbstractDataSourceMBean { boolean isEnable(); - void setEnable(boolean enable); - void shrink(); String toString();