When trying to connect to a server using TCP/IP failed, it will retry at most…

When trying to connect to a server using TCP/IP failed, it will retry at most until the timeout. Before, it was the timeout multiplied with the retry count.

h2/src/main/org/h2/util/NetUtils.java

@@ -100,6 +100,7 @@ public class NetUtils {
      * @return the socket
      */
     public static Socket createSocket(InetAddress address, int port, boolean ssl) throws IOException {
+        long start = System.currentTimeMillis();
         for (int i = 0;; i++) {
             try {
                 if (ssl) {
@@ -110,6 +111,11 @@ public class NetUtils {
                         SysProperties.SOCKET_CONNECT_TIMEOUT);
                 return socket;
             } catch (IOException e) {
+                if (System.currentTimeMillis() - start >= SysProperties.SOCKET_CONNECT_TIMEOUT) {
+                    // either it was a connect timeout,
+                    // or list of different exceptions
+                    throw e;
+                }
                 if (i >= SysProperties.SOCKET_CONNECT_RETRY) {
                     throw e;
                 }