fix for TooTallNate#154

Davidiusdadi · Davidiusdadi · commit 85efa0a17105 · 2013-02-26T00:37:07.000+01:00
diff --git a/src/main/java/org/java_websocket/SSLSocketChannel2.java b/src/main/java/org/java_websocket/SSLSocketChannel2.java
@@ -197,6 +197,10 @@ public int write( ByteBuffer src ) throws IOException {
 
 	}
 
+	/**
+	 * Blocks when in blocking mode until at least one byte has been decoded.<br>
+	 * When not in blocking mode 0 may be returned.
+	 **/
 	public int read( ByteBuffer dst ) throws IOException {
 		if( !dst.hasRemaining() )
 			return 0;
@@ -231,8 +235,12 @@ public int read( ByteBuffer dst ) throws IOException {
 			}
 		inCrypt.flip();
 		unwrap();
-		return transfereTo( inData, dst );
 
+		int transfered = transfereTo( inData, dst );
+		if( transfered == 0 && isBlocking() ) {
+			return read( dst ); // "transfered" may be 0 when not enough bytes were received or during rehandshaking
+		}
+		return transfered;
 	}
 
 	private int readRemaining( ByteBuffer dst ) throws SSLException {
