diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
index f620aa2335..9c332decb2 100644
--- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
@@ -680,14 +680,14 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
                     // 必须存在线程等待，才创建连接
                     int waitThreadCount = lock.getWaitQueueLength(notEmpty);
 
-                    if (poolingCount >= waitThreadCount) {
-                        notEmpty.signal(); // 防止信号丢失引起的等待
+                    // 防止创建超过maxActive数量的连接
+                    if (activeCount + poolingCount >= maxActive) {
                         empty.await();
                         continue;
                     }
-
-                    // 防止创建超过maxActive数量的连接
-                    if (activeCount + poolingCount >= maxActive) {
+                    
+                    if (poolingCount >= waitThreadCount) {
+                        notEmpty.signal(); // 防止信号丢失引起的等待
                         empty.await();
                         continue;
                     }