diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
index ea5b0fac13..24bd11da72 100644
--- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
@@ -647,8 +647,9 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
                     // 必须存在线程等待，才创建连接
                     int waitThreadCount = lock.getWaitQueueLength(notEmpty);
 
-                    if (poolingCount - waitThreadCount >= 0) {
-                        empty.await(3, TimeUnit.SECONDS); // 防止信号丢失引起的等待
+                    if (poolingCount >= waitThreadCount) {
+                        notEmpty.signal();
+                        empty.await(); // 防止信号丢失引起的等待
                         continue;
                     }