From 5a309dcaac0bd88622e52a598b9fd16190ecc048 Mon Sep 17 00:00:00 2001
From: Stiletto <blasux@blasux.ru>
Date: Wed, 19 Sep 2012 22:03:40 +0400
Subject: [PATCH] Attempt to fix hang on WebSocketClient.close()

---
 src/org/java_websocket/WebSocketImpl.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/org/java_websocket/WebSocketImpl.java b/src/org/java_websocket/WebSocketImpl.java
index 4d8d5fe29..4203b1ae5 100644
--- a/src/org/java_websocket/WebSocketImpl.java
+++ b/src/org/java_websocket/WebSocketImpl.java
@@ -404,12 +404,12 @@ protected synchronized void closeConnection( int code, String message, boolean r
 		if( key != null ) {
 			// key.attach( null ); //see issue #114
 			key.cancel();
-			try {
-				channel.close();
-			} catch ( IOException e ) {
-				wsl.onWebsocketError( this, e );
-			}
-		}
+        }
+        try {
+            channel.close();
+        } catch ( IOException e ) {
+            wsl.onWebsocketError( this, e );
+        }
 		// sockchannel.close();
 		this.wsl.onWebsocketClose( this, code, message, remote );
 		if( draft != null )