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

git-svn-id: http://code.alibabatech.com/svn/druid/trunk@30 b9813039-fb51-4c41-a8b9-e21c2acb5095

Browse Source
This commit is contained in:
wenshao
2011-05-12 06:21:53 +00:00
parent 883728e4a3
commit 3b1f49ac09
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/pool/DruidDataAbstractSource.java
+8 -8
View File
@@ -73,7 +73,7 @@ public abstract class DruidDataAbstractSource implements DataSource, DataSourceP
protected String password;
protected String jdbcUrl;
protected String driverClass;
protected Properties properties = new Properties();
protected Properties connectionProperties = new Properties();
protected PasswordCallback passwordCallback;
protected NameCallback userCallback;
@@ -128,7 +128,7 @@ public abstract class DruidDataAbstractSource implements DataSource, DataSourceP
protected List<String> connectionInitSqls;
public void addConnectionProperty(String name, String value) {
properties.put(name, value);
connectionProperties.put(name, value);
}
public Collection<String> getConnectionInitSqls() {
@@ -457,16 +457,16 @@ public abstract class DruidDataAbstractSource implements DataSource, DataSourceP
this.password = password;
}
public Properties getProperties() {
return properties;
public Properties getConnectionProperties() {
return connectionProperties;
}
public void setProperties(Properties properties) {
public void setConnectionProperties(Properties connectionProperties) {
if (inited) {
throw new UnsupportedOperationException();
}
this.properties = properties;
this.connectionProperties = connectionProperties;
}
public String getUrl() {
@@ -570,7 +570,7 @@ public abstract class DruidDataAbstractSource implements DataSource, DataSourceP
this.dataSource = dataSource;
this.url = dataSource.getUrl();
Properties properties = dataSource.getProperties();
Properties properties = dataSource.getConnectionProperties();
String user;
if (dataSource.getUserCallback() != null) {
user = dataSource.getUserCallback().getName();
@@ -585,7 +585,7 @@ public abstract class DruidDataAbstractSource implements DataSource, DataSourceP
password = dataSource.getPassword();
}
this.info = new Properties(dataSource.getProperties());
this.info = new Properties(dataSource.getConnectionProperties());
if (properties != null) {
info.putAll(properties);