[CONJ-490] DataSource connectTimeout is in second, but was set on soc…

…ket timeout that is in milliseconds
mariadb-corporation · Jun 5, 2017 · c8c1c54 · c8c1c54
1 parent d129c09
commit c8c1c54
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/documentation/changelog.creole b/documentation/changelog.creole
@@ -28,6 +28,7 @@ report of 2.0.2 corrections for jre 1.7 compatible version.
 
 == 2.0.2
 Bug
+*[CONJ-490] - DataSource connectTimeout is in second, but was set on socket timeout that is in milliseconds
 *[CONJ-481] - Buffer overrun reading ResultSet when using option "useServerPrepStmts"
 *[CONJ-470] - Error when executing SQL contains "values" and rewriteBatchedStatements=true
 *[CONJ-471] - PK_NAME returned by DatabaseMetadata.getPrimaryKeys() should not be null

diff --git a/src/main/java/org/mariadb/jdbc/MariaDbDataSource.java b/src/main/java/org/mariadb/jdbc/MariaDbDataSource.java
@@ -330,7 +330,7 @@ public void setLogWriter(final PrintWriter out) throws SQLException {
      * @since 1.4
      */
     public int getLoginTimeout() throws SQLException {
-        return urlParser.getOptions().connectTimeout == null ? 0 : urlParser.getOptions().connectTimeout;
+        return urlParser.getOptions().connectTimeout == null ? 0 : urlParser.getOptions().connectTimeout / 1000;
     }
 
     /**
@@ -345,7 +345,7 @@ public int getLoginTimeout() throws SQLException {
      */
     @Override
     public void setLoginTimeout(final int seconds) throws SQLException {
-        urlParser.getOptions().connectTimeout = seconds;
+        urlParser.getOptions().connectTimeout = seconds * 1000;
     }
 
     /**