fix crash caused by "ETIMEDOUT (Connection timed out)"

Author: chen

build.gradle

@@ -39,6 +39,6 @@ dependencies {
 //}
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '1.4'
+    gradleVersion = '2.6'
 }
 

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

@@ -36,7 +36,7 @@
  * <var>onOpen</var>, <var>onClose</var>, and <var>onMessage</var> to be
  * useful. An instance can send messages to it's connected server via the
  * <var>send</var> method.
- * 
+ *
  * @author Nathan Rajlich
  */
 public abstract class WebSocketClient extends WebSocketAdapter implements Runnable {
@@ -111,12 +111,11 @@ public WebSocketClient( URI serverUri , Draft draft , Map<String,String> headers
 		else{
 			conn = (WebSocketImpl) wsfactory.createWebSocket( this, draft, channel.socket() );
 		}
-		
 	}
 
 	/**
 	 * Gets the URI that this WebSocketClient is connected to.
-	 * 
+	 *
 	 * @return The <tt>URI</tt> for this WebSocketClient.
 	 */
 	public URI getURI() {
@@ -163,7 +162,7 @@ public void closeBlocking() throws InterruptedException {
 
 	/**
 	 * Sends <var>text</var> to the connected WebSocket server.
-	 * 
+	 *
 	 * @param text
 	 *            The String to send to the WebSocket server.
 	 */
@@ -173,7 +172,7 @@ public void send( String text ) throws NotYetConnectedException {
 
 	/**
 	 * Sends <var>data</var> to the connected WebSocket server.
-	 * 
+	 *
 	 * @param data
 	 *            The Byte-Array of data to send to the WebSocket server.
 	 */
@@ -191,7 +190,7 @@ public void run() {
 
 	}
 
-	private final void interruptableRun() {
+	private void interruptableRun() {
 		if( channel == null ) {
 			return;// channel will be initialized in the constructor and only be null if no socket channel could be created or if blocking mode could be established
 		}
@@ -221,6 +220,10 @@ private final void interruptableRun() {
 			onWebsocketError( conn, e );
 			conn.closeConnection( CloseFrame.NEVER_CONNECTED, e.getMessage() );
 			return;
+		} catch (/*AssertionError*/Throwable t) {
+			onWebsocketError(conn, new Exception(t));
+			conn.closeConnection(CloseFrame.NEVER_CONNECTED, t.getMessage());
+            return;
 		}
 
 		ByteBuffer buff = ByteBuffer.allocate( WebSocketImpl.RCVBUF );
@@ -303,7 +306,7 @@ public READYSTATE getReadyState() {
 
 	/**
 	 * Calls subclass' implementation of <var>onMessage</var>.
-	 * 
+	 *
 	 * @param conn
 	 * @param message
 	 */
@@ -319,7 +322,7 @@ public final void onWebsocketMessage( WebSocket conn, ByteBuffer blob ) {
 
 	/**
 	 * Calls subclass' implementation of <var>onOpen</var>.
-	 * 
+	 *
 	 * @param conn
 	 */
 	@Override
@@ -330,7 +333,7 @@ public final void onWebsocketOpen( WebSocket conn, Handshakedata handshake ) {
 
 	/**
 	 * Calls subclass' implementation of <var>onClose</var>.
-	 * 
+	 *
 	 * @param conn
 	 */
 	@Override
@@ -344,7 +347,7 @@ public final void onWebsocketClose( WebSocket conn, int code, String reason, boo
 
 	/**
 	 * Calls subclass' implementation of <var>onIOError</var>.
-	 * 
+	 *
 	 * @param conn
 	 */
 	@Override
@@ -405,7 +408,7 @@ public InetSocketAddress getRemoteSocketAddress( WebSocket conn ) {
 	public abstract void onClose( int code, String reason, boolean remote );
 	public abstract void onError( Exception ex );
 	public void onMessage( ByteBuffer bytes ) {
-	};
+	}
 
 	public class DefaultClientProxyChannel extends AbstractClientProxyChannel {
 		public DefaultClientProxyChannel( ByteChannel towrap ) {
@@ -428,7 +431,7 @@ public String buildHandShake() {
 	}
 
 	public interface WebSocketClientFactory extends WebSocketFactory {
-		public ByteChannel wrapChannel( SocketChannel channel, SelectionKey key, String host, int port ) throws IOException;
+		ByteChannel wrapChannel( SocketChannel channel, SelectionKey key, String host, int port ) throws IOException;
 	}
 
 	private class WebsocketWriteThread implements Runnable {
@@ -446,7 +449,7 @@ public void run() {
 			}
 		}
 	}
-	
+
 	public ByteChannel createProxyChannel( ByteChannel towrap ) {
 		if( proxyAddress != null ){
 			return new DefaultClientProxyChannel( towrap );