fixed case in which a the bytes could be skipped when the handshake was

Davidiusdadi · Davidiusdadi · commit a2e09f113e19 · 2013-07-31T23:27:04.000+02:00
received in multiple parts and the last part was including nonpayload
data.
diff --git a/src/main/java/org/java_websocket/WebSocketImpl.java b/src/main/java/org/java_websocket/WebSocketImpl.java
@@ -93,7 +93,7 @@ public class WebSocketImpl implements WebSocket {
 	private Opcode current_continuous_frame_opcode = null;
 
 	/** the bytes of an incomplete received handshake */
-	private ByteBuffer tmpHandshakeBytes;
+	private ByteBuffer tmpHandshakeBytes = ByteBuffer.allocate( 0 );
 
 	/** stores the handshake sent by this websocket ( Role.CLIENT only ) */
 	private ClientHandshake handshakerequest = null;
@@ -147,8 +147,11 @@ public WebSocketImpl( WebSocketListener listener , List<Draft> drafts , Socket s
 	 * 
 	 */
 	public void decode( ByteBuffer socketBuffer ) {
-		if( !socketBuffer.hasRemaining() || flushandclosestate )
+		assert ( socketBuffer.hasRemaining() );
+
+		if( flushandclosestate ) {
 			return;
+		}
 
 		if( DEBUG )
 			System.out.println( "process(" + socketBuffer.remaining() + "): {" + ( socketBuffer.remaining() > 1000 ? "too big to display" : new String( socketBuffer.array(), socketBuffer.position(), socketBuffer.remaining() ) ) + "}" );
@@ -157,19 +160,24 @@ public void decode( ByteBuffer socketBuffer ) {
 			decodeFrames( socketBuffer );
 		} else {
 			if( decodeHandshake( socketBuffer ) ) {
-				decodeFrames( socketBuffer );
+				assert ( tmpHandshakeBytes.hasRemaining() != socketBuffer.hasRemaining() || !socketBuffer.hasRemaining() ); // the buffers will never have remaining bytes at the same time
+
+				if( socketBuffer.hasRemaining() ) {
+					decodeFrames( socketBuffer );
+				} else if( tmpHandshakeBytes.hasRemaining() ) {
+					decodeFrames( tmpHandshakeBytes );
+				}
 			}
 		}
 		assert ( isClosing() || isFlushAndClose() || !socketBuffer.hasRemaining() );
 	}
-
 	/**
 	 * Returns whether the handshake phase has is completed.
 	 * In case of a broken handshake this will be never the case.
 	 **/
 	private boolean decodeHandshake( ByteBuffer socketBufferNew ) {
 		ByteBuffer socketBuffer;
-		if( tmpHandshakeBytes == null ) {
+		if( tmpHandshakeBytes.capacity() == 0 ) {
 			socketBuffer = socketBufferNew;
 		} else {
 			if( tmpHandshakeBytes.remaining() < socketBufferNew.remaining() ) {
@@ -257,7 +265,7 @@ private boolean decodeHandshake( ByteBuffer socketBufferNew ) {
 					draft.setParseMode( role );
 					Handshakedata tmphandshake = draft.translateHandshake( socketBuffer );
 					if( tmphandshake instanceof ServerHandshake == false ) {
-						flushAndClose( CloseFrame.PROTOCOL_ERROR, "Wwrong http function", false );
+						flushAndClose( CloseFrame.PROTOCOL_ERROR, "wrong http function", false );
 						return false;
 					}
 					ServerHandshake handshake = (ServerHandshake) tmphandshake;
@@ -283,7 +291,7 @@ private boolean decodeHandshake( ByteBuffer socketBufferNew ) {
 				close( e );
 			}
 		} catch ( IncompleteHandshakeException e ) {
-			if( tmpHandshakeBytes == null ) {
+			if( tmpHandshakeBytes.capacity() == 0 ) {
 				socketBuffer.reset();
 				int newsize = e.getPreferedSize();
 				if( newsize == 0 ) {
