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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
wenshao
2016-10-08 19:06:31 +08:00
parent dc2d7bd2af f982f85792
commit 93cfb5ba58
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/pool/DruidDataSourceC3P0Adapter.java
+2 -2
View File
@@ -145,11 +145,11 @@ public class DruidDataSourceC3P0Adapter implements DataSource, DruidDataSourceC3
}
public int getCheckoutTimeout() {
return (int) dataSource.getMaxWait() / 1000;
return (int) dataSource.getMaxWait();
}
public void setCheckoutTimeout(int checkoutTimeout) {
dataSource.setMaxWait(checkoutTimeout * 1000);
dataSource.setMaxWait(checkoutTimeout);
}
public boolean isAutoCommitOnClose() {