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

refactor DruidDataSource

Browse Source
This commit is contained in:
wenshao
2012-08-17 10:38:08 +08:00
parent 5c0c686a27
commit e837802844
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java
+5 -7
View File
@@ -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) {