Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

修正spring初始化的bug

Browse Source 
git-svn-id: http://code.alibabatech.com/svn/druid/trunk@391 b9813039-fb51-4c41-a8b9-e21c2acb5095
This commit is contained in:
wenshao
2011-07-13 00:02:50 +00:00
parent 906b23b61a
commit 26abac22c2
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java
+4 -4
View File
@@ -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);
src/test/java/com/alibaba/druid/bvt/pool/PasswordCallbackTest.java
+1 -1
View File
@@ -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 {