Merge pull request TooTallNate#461 from marci4/master

marci4 · web-flow · commit 3816d6890382 · 2017-04-24T10:55:10.000+02:00
Fixing 100% CPU untilisation when SSL negotiations fail
diff --git a/src/main/java/org/java_websocket/SSLSocketChannel2.java b/src/main/java/org/java_websocket/SSLSocketChannel2.java
@@ -162,6 +162,14 @@ private synchronized ByteBuffer wrap( ByteBuffer b ) throws SSLException {
 	 **/
 	private synchronized ByteBuffer unwrap() throws SSLException {
 		int rem;
+		//There are some ssl test suites, which get around the selector.select() call, which cause an infinite unwrap and 100% cpu usage (see #459 and #458)
+		if(readEngineResult.getStatus() == SSLEngineResult.Status.CLOSED && sslEngine.getHandshakeStatus() == HandshakeStatus.NOT_HANDSHAKING){
+			try {
+				close();
+			} catch (IOException e) {
+				//Not really interesting
+			}
+		}
 		do {
 			rem = inData.remaining();
 			readEngineResult = sslEngine.unwrap( inCrypt, inData );
