Merge pull request TooTallNate#724 from cymp/master

added a timeout option for connectBlocking

src/main/java/org/java_websocket/client/WebSocketClient.java

@@ -38,6 +38,7 @@
 import java.util.Collections;
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLException;
@@ -281,6 +282,20 @@ public boolean connectBlocking() throws InterruptedException {
 		return engine.isOpen();
 	}
 
+	/**
+	 * Same as <code>connect</code> but blocks with a timeout until the websocket connected or failed to do so.<br>
+	 * @param timeout
+	 *               The connect timeout
+	 * @param timeUnit
+	 *                The timeout time unit
+	 * @return Returns whether it succeeded or not.
+	 * @throws InterruptedException Thrown when the threads get interrupted
+	 */
+	public boolean connectBlocking(long timeout, TimeUnit timeUnit) throws InterruptedException {
+		connect();
+		return connectLatch.await(timeout, timeUnit) && engine.isOpen();
+	}
+
 	/**
 	 * Initiates the websocket close handshake. This method does not block<br>
 	 * In oder to make sure the connection is closed use <code>closeBlocking</code>