Merge branch 'master' of https://github.com/wenshao/druid

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;
@@ -382,6 +383,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
             return;
         }
 
+        final ReentrantLock lock = this.lock;
         try {
             lock.lockInterruptibly();
         } catch (InterruptedException e) {