fix testcase

wenshao · Nov 26, 2023 · b8ae025 · b8ae025
1 parent 4cd8403
commit b8ae025
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/core/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/core/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
@@ -1740,7 +1740,7 @@ private DruidPooledConnection getConnectionInternal(long maxWait) throws SQLExce
 
             try {
                 if (maxWaitThreadCount > 0
-                        && notEmptyWaitThreadCount >= maxWaitThreadCount) {
+                        && notEmptyWaitThreadCount > maxWaitThreadCount) {
                     connectErrorCountUpdater.incrementAndGet(this);
                     throw new SQLException("maxWaitThreadCount " + maxWaitThreadCount + ", current wait Thread count "
                             + lock.getQueueLength());

diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_notEmptyWait.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_notEmptyWait.java
@@ -75,15 +75,15 @@ public void run() {
             Thread.sleep(10);
         }
 
-        Assert.assertEquals(0, dataSource.getNotEmptyWaitThreadCount());
-        Assert.assertEquals(1, dataSource.getNotEmptyWaitThreadPeak());
+        Assert.assertEquals(10, dataSource.getNotEmptyWaitThreadCount());
+        Assert.assertEquals(10, dataSource.getNotEmptyWaitThreadPeak());
 
         conn.close();
 
         endLatch.await(100, TimeUnit.MILLISECONDS);
 
         Thread.sleep(10);
 //        Assert.assertEquals(0, dataSource.getNotEmptyWaitThreadCount());
-        Assert.assertEquals(1, dataSource.getNotEmptyWaitThreadPeak());
+        Assert.assertEquals(10, dataSource.getNotEmptyWaitThreadPeak());
     }
 }
diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_notEmptyWait2.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_notEmptyWait2.java
@@ -52,7 +52,7 @@ public void run() {
                         System.out.println(Thread.currentThread() +" "+ LocalDateTime.now() + " getConnection== " + conn);
                         conn.close();
                     } catch (Exception e) {
-                        // e.printStackTrace();
+                         e.printStackTrace();
                         errorCount.incrementAndGet();
                     } finally {
                         endLatch.countDown();