fixed an other bug in the handshake ( TooTallNate#91 and TooTallNate#94)

Davidiusdadi · Davidiusdadi · commit 8ef67b46ecc9 · 2012-05-22T16:39:19.000+02:00
diff --git a/src/org/java_websocket/WebSocketImpl.java b/src/org/java_websocket/WebSocketImpl.java
@@ -207,6 +207,7 @@ private boolean decodeHandshake( ByteBuffer socketBufferNew ) throws IOException
 			tmpHandshakeBytes.flip();
 			socketBuffer = tmpHandshakeBytes;
 		}
+		socketBuffer.mark();
 		try {
 			if( draft == null ) {
 				HandshakeState isflashedgecase = isFlashEdgeCase( socketBuffer );
@@ -217,7 +218,7 @@ private boolean decodeHandshake( ByteBuffer socketBufferNew ) throws IOException
 				}
 			}
 			HandshakeState handshakestate = null;
-			socketBuffer.mark();
+
 			try {
 				if( role == Role.SERVER ) {
 					if( draft == null ) {
@@ -298,6 +299,7 @@ private boolean decodeHandshake( ByteBuffer socketBufferNew ) throws IOException
 			}
 		} catch ( IncompleteHandshakeException e ) {
 			if( tmpHandshakeBytes == null ) {
+				socketBuffer.reset();
 				int newsize = e.getPreferedSize();
 				if( newsize == 0 ) {
 					newsize = socketBuffer.capacity() + 16;

Original file line number	Diff line number	Diff line change
`@@ -207,6 +207,7 @@ private boolean decodeHandshake( ByteBuffer socketBufferNew ) throws IOException`
`207`	`207`	`tmpHandshakeBytes.flip();`
`208`	`208`	`socketBuffer = tmpHandshakeBytes;`
`209`	`209`	`}`
	`210`	`+ socketBuffer.mark();`
`210`	`211`	`try {`
`211`	`212`	`if( draft == null ) {`
`212`	`213`	`HandshakeState isflashedgecase = isFlashEdgeCase( socketBuffer );`
`@@ -217,7 +218,7 @@ private boolean decodeHandshake( ByteBuffer socketBufferNew ) throws IOException`
`217`	`218`	`}`
`218`	`219`	`}`
`219`	`220`	`HandshakeState handshakestate = null;`
`220`		`- socketBuffer.mark();`
	`221`	`+`
`221`	`222`	`try {`
`222`	`223`	`if( role == Role.SERVER ) {`
`223`	`224`	`if( draft == null ) {`
`@@ -298,6 +299,7 @@ private boolean decodeHandshake( ByteBuffer socketBufferNew ) throws IOException`
`298`	`299`	`}`
`299`	`300`	`} catch ( IncompleteHandshakeException e ) {`
`300`	`301`	`if( tmpHandshakeBytes == null ) {`
	`302`	`+ socketBuffer.reset();`
`301`	`303`	`int newsize = e.getPreferedSize();`
`302`	`304`	`if( newsize == 0 ) {`
`303`	`305`	`newsize = socketBuffer.capacity() + 16;`