From 6e2c94937eaa32a5fc54eef9b05ffdb31d30eff8 Mon Sep 17 00:00:00 2001 From: arbow Date: Thu, 29 Sep 2016 15:20:54 +0800 Subject: [PATCH] time unit of 'checkoutTimeout' is milliseconds, don't need to be multiplied by 1000 --- .../com/alibaba/druid/pool/DruidDataSourceC3P0Adapter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSourceC3P0Adapter.java b/src/main/java/com/alibaba/druid/pool/DruidDataSourceC3P0Adapter.java index dd36e142e8..d35a5cacd6 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSourceC3P0Adapter.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSourceC3P0Adapter.java @@ -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() {