fix for TooTallNate#105

Davidiusdadi · Davidiusdadi · commit a7644a0ff2f5 · 2012-08-02T21:22:56.000+02:00
diff --git a/src/org/java_websocket/client/WebSocketClient.java b/src/org/java_websocket/client/WebSocketClient.java
@@ -187,10 +187,25 @@ public void run() {
 		if( thread == null )
 			thread = Thread.currentThread();
 		interruptableRun();
+
+		try {
+			selector.close();
+		} catch ( IOException e ) {
+			onError( e );
+		}
+		closelock.lock();
+		selector = null;
+		closelock.unlock();
+		try {
+			channel.close();
+		} catch ( IOException e ) {
+			onError( e );
+		}
+		channel = null;
 		thread = null;
 	}
 
-	protected final void interruptableRun() {
+	private final void interruptableRun() {
 		try {
 			tryToConnect( new InetSocketAddress( uri.getHost(), getPort() ) );
 		} catch ( ClosedByInterruptException e ) {
@@ -247,21 +262,6 @@ protected final void interruptableRun() {
 			onError( e );
 			conn.eot( e );
 		}
-
-		try {
-			selector.close();
-		} catch ( IOException e ) {
-			onError( e );
-		}
-		closelock.lock();
-		selector = null;
-		closelock.unlock();
-		try {
-			channel.close();
-		} catch ( IOException e ) {
-			onError( e );
-		}
-		channel = null;
 	}
 
 	private int getPort() {
