fixed case in which onClose's would be CloseFrame.ABNORMAL_CLOSE wrongly and made WebSocketImpl work without SelectionKeys

Davidiusdadi · Davidiusdadi · commit c00c3d95627c · 2013-01-02T01:01:01.000+01:00
diff --git a/src/main/java/org/java_websocket/WebSocketImpl.java b/src/main/java/org/java_websocket/WebSocketImpl.java
@@ -431,11 +431,11 @@ 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 );
 		}
 		try {
 			this.wsl.onWebsocketClose( this, code, message, remote );
@@ -489,9 +489,8 @@ protected synchronized void flushAndClose( int code, String message, boolean rem
 	public void eot() {
 		if( getReadyState() == READYSTATE.NOT_YET_CONNECTED ) {
 			closeConnection( CloseFrame.NEVER_CONNECTED, true );
-		}
-		if( draft == null ) {
-			closeConnection( CloseFrame.ABNORMAL_CLOSE, true );
+		} else if( flushandclosestate ) {
+			closeConnection( closecode, closemessage, closedremotely );
 		} else if( draft.getCloseHandshakeType() == CloseHandshakeType.NONE ) {
 			closeConnection( CloseFrame.NORMAL, true );
 		} else if( draft.getCloseHandshakeType() == CloseHandshakeType.ONEWAY ) {
