diff --git a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java
index 8e424e790b..6fc3528c78 100644
--- a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java
+++ b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java
@@ -248,8 +248,6 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements
         this.useLocalSessionState = useLocalSessionState;
     }
 
-
-
     public boolean isOracle() {
         return isOracle;
     }
diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
index 674fa62d43..e50294ec67 100644
--- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
@@ -33,6 +33,7 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
 
 import javax.management.JMException;
 import javax.management.ObjectName;
@@ -383,6 +384,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
             return;
         }
 
+        final ReentrantLock lock = this.lock;
         try {
             lock.lockInterruptibly();
         } catch (InterruptedException e) {
diff --git a/src/test/java/com/alibaba/druid/filter/config/ConfigFileGenerator.java b/src/test/java/com/alibaba/druid/filter/config/ConfigFileGenerator.java
index a3e5ca1218..53e7923524 100644
--- a/src/test/java/com/alibaba/druid/filter/config/ConfigFileGenerator.java
+++ b/src/test/java/com/alibaba/druid/filter/config/ConfigFileGenerator.java
@@ -29,6 +29,7 @@ public class ConfigFileGenerator {
             filePath = file.getAbsolutePath();
 
             out = new PrintWriter(new FileWriter(file));
+            out.println(DruidDataSourceFactory.PROP_MAXWAIT + "=1000");
             out.println(DruidDataSourceFactory.PROP_USERNAME + "=test1");
             out.println(DruidDataSourceFactory.PROP_PASSWORD + "=OJfUm6WCHi7EuXqE6aEc+Po2xFrAGBeSNy8O2jWhV2FTG8/5kbRRr2rjNKhptlevm/03Y0048P7h88gdUOXAYg==");
             out.println(DruidDataSourceFactory.PROP_URL + "=jdbc:oracle:thin:@");