Fixed Websocket Server freeze on SSLException

marci4 · marci4 · commit 166b10e68973 · 2017-03-17T18:04:13.000+01:00
Fix for TooTallNate#433
diff --git a/src/main/java/org/java_websocket/server/WebSocketServer.java b/src/main/java/org/java_websocket/server/WebSocketServer.java
@@ -321,8 +321,10 @@ public void run() {
 								allocateBuffers( w );
 								continue;
 							} catch (IOException ex) {
-								if (w.key != null)
-									w.key.cancel();							
+								if( w.key != null )
+									w.key.cancel();
+
+								handleIOException( w.key, null, ex );
 							}
 							continue;
 						}
@@ -464,7 +466,7 @@ private void handleIOException( SelectionKey key, WebSocket conn, IOException ex
 					// there is nothing that must be done here
 				}
 				if( WebSocketImpl.DEBUG )
-					System.out.println( "Connection closed because of" + ex );
+					System.out.println("Connection closed because of " + ex);
 			}
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -321,8 +321,10 @@ public void run() {`
`321`	`321`	`allocateBuffers( w );`
`322`	`322`	`continue;`
`323`	`323`	`} catch (IOException ex) {`
`324`		`- if (w.key != null)`
`325`		`- w.key.cancel();`
	`324`	`+ if( w.key != null )`
	`325`	`+ w.key.cancel();`
	`326`	`+`
	`327`	`+ handleIOException( w.key, null, ex );`
`326`	`328`	`}`
`327`	`329`	`continue;`
`328`	`330`	`}`
`@@ -464,7 +466,7 @@ private void handleIOException( SelectionKey key, WebSocket conn, IOException ex`
`464`	`466`	`// there is nothing that must be done here`
`465`	`467`	`}`
`466`	`468`	`if( WebSocketImpl.DEBUG )`
`467`		`- System.out.println( "Connection closed because of" + ex );`
	`469`	`+ System.out.println("Connection closed because of " + ex);`
`468`	`470`	`}`
`469`	`471`	`}`
`470`	`472`	`}`