diff --git a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java index 10cd9cdea3..7d9fe46ddd 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java @@ -173,6 +173,7 @@ public abstract class DruidAbstractDataSource implements DruidAbstractDataSource protected final AtomicLong commitCount = new AtomicLong(); protected final AtomicLong rollbackCount = new AtomicLong(); + private long loginTimeoutMillis = 0; public long getCommitCount() { return commitCount.get(); @@ -696,12 +697,12 @@ public abstract class DruidAbstractDataSource implements DruidAbstractDataSource @Override public void setLoginTimeout(int seconds) throws SQLException { - + loginTimeoutMillis = seconds * 1000; } @Override - public int getLoginTimeout() throws SQLException { - return 0; + public int getLoginTimeout() { + return (int) loginTimeoutMillis * 1000; } @Override diff --git a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSourceMBean.java b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSourceMBean.java index 0497477d4d..81b2c8b094 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSourceMBean.java +++ b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSourceMBean.java @@ -4,6 +4,7 @@ import java.util.Date; import java.util.List; public interface DruidAbstractDataSourceMBean { + int getLoginTimeout(); String getDbType();