Fixed situation in which a connection would not be closed by the server if the client connects via ws also the server expects wss

Davidiusdadi · Davidiusdadi · commit 1c655b4dc891 · 2013-03-17T22:35:46.000+01:00
diff --git a/src/main/java/org/java_websocket/server/WebSocketServer.java b/src/main/java/org/java_websocket/server/WebSocketServer.java
@@ -8,6 +8,7 @@
 import java.nio.ByteBuffer;
 import java.nio.channels.ByteChannel;
 import java.nio.channels.CancelledKeyException;
+import java.nio.channels.SelectableChannel;
 import java.nio.channels.SelectionKey;
 import java.nio.channels.Selector;
 import java.nio.channels.ServerSocketChannel;
@@ -370,7 +371,7 @@ public void run() {
 				} catch ( IOException ex ) {
 					if( key != null )
 						key.cancel();
-					handleIOException( conn, ex );
+					handleIOException( key, conn, ex );
 				} catch ( InterruptedException e ) {
 					return;// FIXME controlled shutdown
 				}
@@ -416,10 +417,21 @@ private void pushBuffer( ByteBuffer buf ) throws InterruptedException {
 		buffers.put( buf );
 	}
 
-	private void handleIOException( WebSocket conn, IOException ex ) {
+	private void handleIOException( SelectionKey key, WebSocket conn, IOException ex ) {
 		onWebsocketError( conn, ex );// conn may be null here
 		if( conn != null ) {
 			conn.closeConnection( CloseFrame.ABNORMAL_CLOSE, ex.getMessage() );
+		} else if( key != null ) {
+			SelectableChannel channel = key.channel();
+			if( channel != null && channel.isOpen() ) { // this could be the case if the IOException ex is a SSLException
+				try {
+					channel.close();
+				} catch ( IOException e ) {
+					// there is nothing that must be done here
+				}
+				if( WebSocketImpl.DEBUG )
+					System.out.println( "Connection closed because of" + ex );
+			}
 		}
 	}
 
