From 3e9b26730b1f154efcc2230d0a212c4bfaa616a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B8=A9=E5=B0=91?= <szujobs@hotmail.com>
Date: Wed, 20 Jun 2012 15:10:12 +0800
Subject: [PATCH] if Filter's method connection_connect return null, throw
 NullPointerException, fixed it.

---
 .../com/alibaba/druid/pool/DruidAbstractDataSource.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java
index 322904c3b5..2bcf7495be 100644
--- a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java
+++ b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java
@@ -1274,10 +1274,10 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements
                     conn = new FilterChainImpl(dataSource).connection_connect(info);
                 } else {
                     conn = dataSource.getDriver().connect(url, info);
-
-                    if (conn == null) {
-                        throw new SQLException("connect error, url " + url);
-                    }
+                }
+                
+                if (conn == null) {
+                    throw new SQLException("connect error, url " + url);
                 }
 
                 conn.setAutoCommit(dataSource.isDefaultAutoCommit());