diff --git a/pom.xml b/pom.xml
index a1d3f19dda..4a7a6c0a06 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.alibaba</groupId>
 	<artifactId>druid</artifactId>
-	<version>1.1.20_preview_06</version>
+	<version>1.1.20_preview_07</version>
 
 	<packaging>jar</packaging>
 	<name>druid</name>
diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
index e8398b29ff..7feb4574b5 100644
--- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
@@ -1740,8 +1740,6 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
             sql = sql.substring(0, 1024);
         }
 
-        DruidAbstractDataSource dataSource = holder.getDataSource();
-
         boolean requireDiscard = false;
         final ReentrantLock lock = conn.lock;
         lock.lock();
@@ -1761,8 +1759,8 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
             lock.unlock();
         }
 
-        if(dataSource != null) {
-            ReentrantLock dataSourceLock = dataSource.lock;
+        if(holder != null && holder.getDataSource() != null) {
+            ReentrantLock dataSourceLock = holder.getDataSource().lock;
             dataSourceLock.lock();
             try {
                 if (poolingCount < minIdle) {