[CONJ-1276] Connection#isValid(int timeout) does not obey the passed in timeout if the network is down.

Author: rusher

src/main/java/org/mariadb/jdbc/Connection.java

@@ -701,7 +701,9 @@ public boolean isValid(int timeout) throws SQLException {
     if (timeout < 0) {
       throw exceptionFactory.create("the value supplied for timeout is negative");
     }
+    int initialSocketTimeout = client.getSocketTimeout();
     try (ClosableLock ignore = lock.closeableLock()) {
+      if (initialSocketTimeout != timeout * 1000) client.setSocketTimeout(timeout * 1000);
       client.execute(PingPacket.INSTANCE, true);
       return true;
     } catch (SQLException sqle) {
@@ -711,6 +713,14 @@ public boolean isValid(int timeout) throws SQLException {
         poolConnection.close();
       }
       return false;
+    } finally {
+      if (initialSocketTimeout != timeout * 1000) {
+        try {
+          client.setSocketTimeout(initialSocketTimeout);
+        }  catch (SQLException sqle) {
+          // eat
+        }
+      }
     }
   }
 

src/test/java/org/mariadb/jdbc/integration/ConnectionTest.java

@@ -8,12 +8,15 @@
 import java.sql.*;
 import java.sql.Connection;
 import java.sql.Statement;
+import java.time.Duration;
+import java.time.Instant;
 import java.util.*;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import org.junit.jupiter.api.*;
 import org.mariadb.jdbc.*;
+import org.mariadb.jdbc.export.HaMode;
 import org.mariadb.jdbc.integration.util.SocketFactoryBasicTest;
 import org.mariadb.jdbc.integration.util.SocketFactoryTest;
 import org.mariadb.jdbc.util.constants.Capabilities;
@@ -1510,4 +1513,23 @@ public void isClosed() throws SQLException {
     assertTrue(stmt.isClosed());
     assertTrue(preparedStatement.isClosed());
   }
+
+  @Test
+  public void isValidTimeoutValidation() throws SQLException {
+    try (org.mariadb.jdbc.Connection con = createProxyCon(HaMode.NONE, "")) {
+      proxy.setDelay(2000);
+      Instant start = Instant.now();
+      try {
+        con.isValid(1);
+      } catch (SQLException e) {
+        // eat
+      }
+      Instant end = Instant.now();
+      Duration duration = Duration.between(start, end);
+      assertTrue(duration.toMillis() > 950);
+      assertTrue(duration.toMillis() < 1500);
+    } finally {
+      proxy.forceClose();
+    }
+  }
 }