New system property h2.socketConnectTimeout.

h2/src/main/org/h2/constant/SysProperties.java

@@ -503,6 +503,12 @@ public class SysProperties {
      */
     public static final boolean SHARE_LINKED_CONNECTIONS = getBooleanSetting("h2.shareLinkedConnections", Constants.VERSION > 1.0);
     
+    /**
+     * System property <code>h2.socketConnectTimeout</code> (default: 2000).<br />
+     * The timeout in milliseconds to connect to a server.
+     */
+    public static final int SOCKET_CONNECT_TIMEOUT = getIntSetting("h2.socketConnectTimeout", 2000);
+    
     /**
      * System property <code>h2.sortNullsHigh</code> (default: false).<br />
      * Invert the default sorting behavior for NULL values, such that NULL

h2/src/main/org/h2/security/SecureSocketFactory.java

@@ -12,6 +12,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.InetAddress;
+import java.net.InetSocketAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.security.KeyFactory;
@@ -67,7 +68,9 @@ public class SecureSocketFactory {
 //## Java 1.4 begin ##
         setKeystore();
         SSLSocketFactory f = (SSLSocketFactory) SSLSocketFactory.getDefault();
-        SSLSocket secureSocket = (SSLSocket) f.createSocket(address, port);
+        SSLSocket secureSocket = (SSLSocket) f.createSocket();
+        secureSocket.connect(new InetSocketAddress(address, port), 
+                SysProperties.SOCKET_CONNECT_TIMEOUT);
         if (SysProperties.ENABLE_ANONYMOUS_SSL) {
             String[] list = secureSocket.getEnabledCipherSuites();
             list = addAnonymous(list);