From 26abac22c21fc09e664ef19f49c0ac26f949eec0 Mon Sep 17 00:00:00 2001
From: wenshao <szujobs@hotmail.com>
Date: Wed, 13 Jul 2011 00:02:50 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3spring=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://code.alibabatech.com/svn/druid/trunk@391 b9813039-fb51-4c41-a8b9-e21c2acb5095
---
 .../com/alibaba/druid/pool/DruidAbstractDataSource.java   | 8 ++++----
 .../com/alibaba/druid/bvt/pool/PasswordCallbackTest.java  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java
index bfdab4701d..d5c4013cb7 100644
--- a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java
+++ b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java
@@ -526,11 +526,11 @@ public abstract class DruidAbstractDataSource implements DruidAbstractDataSource
         this.password = password;
     }
 
-    public Properties getConnectionProperties() {
+    public Properties getConnectProperties() {
         return connectionProperties;
     }
 
-    public void setConnectionProperties(Properties connectionProperties) {
+    public void setConnectProperties(Properties connectionProperties) {
         if (inited) {
             throw new UnsupportedOperationException();
         }
@@ -827,7 +827,7 @@ public abstract class DruidAbstractDataSource implements DruidAbstractDataSource
             this.dataSource = dataSource;
             this.url = dataSource.getUrl();
 
-            Properties properties = dataSource.getConnectionProperties();
+            Properties properties = dataSource.getConnectProperties();
             String user;
             if (dataSource.getUserCallback() != null) {
                 user = dataSource.getUserCallback().getName();
@@ -870,7 +870,7 @@ public abstract class DruidAbstractDataSource implements DruidAbstractDataSource
                 password = dataSource.getPassword();
             }
 
-            this.info = new Properties(dataSource.getConnectionProperties());
+            this.info = new Properties(dataSource.getConnectProperties());
 
             if (properties != null) {
                 info.putAll(properties);
diff --git a/src/test/java/com/alibaba/druid/bvt/pool/PasswordCallbackTest.java b/src/test/java/com/alibaba/druid/bvt/pool/PasswordCallbackTest.java
index 59b0724dc3..d6c347056d 100644
--- a/src/test/java/com/alibaba/druid/bvt/pool/PasswordCallbackTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/pool/PasswordCallbackTest.java
@@ -23,7 +23,7 @@ public class PasswordCallbackTest extends TestCase {
         conn.close();
         
         Assert.assertEquals(dataSource.getUrl(), passwordCallback.getUrl());
-        Assert.assertEquals(dataSource.getConnectionProperties(), passwordCallback.getProperties());
+        Assert.assertEquals(dataSource.getConnectProperties(), passwordCallback.getProperties());
     }
 
     public static class TestPasswordCallback extends PasswordCallback {