diff --git a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java
index 4fc1556d16..64d9c5c26d 100644
--- a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java
+++ b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java
@@ -571,6 +571,7 @@ public abstract class DruidAbstractDataSource implements DataSource, DataSourceP
     protected void printStackTrace(Throwable e) {
         if (logWriter != null) {
             e.printStackTrace(logWriter);
+            logWriter.flush();
         }
     }
 
diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
index 96ad305528..5bd8fcdba4 100644
--- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
@@ -522,9 +522,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
                     ConnectionHolder poolableConnection = new ConnectionHolder(DruidDataSource.this, connection);
                     connections[count++] = poolableConnection;
 
-                    if (count == 1) {
-                        notEmpty.signal();
-                    }
+                    notEmpty.signal();
 
                 } catch (InterruptedException e) {
                     break;
diff --git a/src/test/java/com/alibaba/druid/bvt/pool/Case2.java b/src/test/java/com/alibaba/druid/bvt/pool/Case2.java
index dc66e09d32..fac94d0bdb 100644
--- a/src/test/java/com/alibaba/druid/bvt/pool/Case2.java
+++ b/src/test/java/com/alibaba/druid/bvt/pool/Case2.java
@@ -40,9 +40,9 @@ public class Case2 extends TestCase {
         properties.put("maxActive", "100");
         properties.put("maxIdle", "30");
         properties.put("maxWait", "10000");
-        properties.put("url", "jdbc:derby:memory:tomcat-jndi;create=true");
+        properties.put("url", "jdbc:mock:");
         properties.put("filters", "stat");
-        properties.put("validationQuery", "");
+        properties.put("validationQuery", "SELECT 1");
         final DruidDataSource dataSource = (DruidDataSource) com.alibaba.druid.pool.DruidDataSourceFactory.createDataSource(properties);
         JMXUtils.register("com.alibaba.druid:type=DruidDataSource", dataSource);