From e837802844ba2128b4e65ddcb5e2cfadbc4428d1 Mon Sep 17 00:00:00 2001
From: wenshao <szujobs@hotmail.com>
Date: Fri, 17 Aug 2012 10:38:08 +0800
Subject: [PATCH] refactor DruidDataSource

---
 .../alibaba/druid/pool/DruidAbstractDataSource.java  | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java
index 6b78dd5914..a16c23f5e8 100644
--- a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java
+++ b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java
@@ -1221,7 +1221,7 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements
 
     public Connection createPhysicalConnection() throws SQLException {
         String url = this.getUrl();
-        Properties connectProperty = getConnectProperties();
+        Properties connectProperties = getConnectProperties();
 
         String user;
         if (getUserCallback() != null) {
@@ -1237,7 +1237,7 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements
             DruidPasswordCallback druidPasswordCallback = (DruidPasswordCallback) passwordCallback;
 
             druidPasswordCallback.setUrl(url);
-            druidPasswordCallback.setProperties(connectProperty);
+            druidPasswordCallback.setProperties(connectProperties);
 
             char[] chars = passwordCallback.getPassword();
             if (chars != null) {
@@ -1245,11 +1245,9 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements
             }
         }
 
-        Properties physicalConnectProperties;
-        if (connectProperty != null) {
-            physicalConnectProperties = new Properties(connectProperty);
-        } else {
-            physicalConnectProperties = new Properties();
+        Properties physicalConnectProperties = new Properties();
+        if (connectProperties != null) {
+            physicalConnectProperties.putAll(connectProperties);
         }
 
         if (user != null && user.length() != 0) {