fixed rare framing bug

Davidiusdadi · Davidiusdadi · commit fe10a641a21f · 2012-05-20T23:27:41.000+02:00
diff --git a/example/ChatServer.java b/example/ChatServer.java
@@ -37,10 +37,7 @@ public void onClose( WebSocket conn, int code, String reason, boolean remote ) {
 	@Override
 	public void onMessage( WebSocket conn, String message ) {
 		this.sendToAll( message );
-
-			this.sendToAll( message );
-
-		// System.out.println( conn + ": " + message );
+		System.out.println( conn + ": " + message );
 	}
 
 	public static void main( String[] args ) throws InterruptedException , IOException {
diff --git a/src/org/java_websocket/drafts/Draft_75.java b/src/org/java_websocket/drafts/Draft_75.java
@@ -158,6 +158,7 @@ protected List<Framedata> translateRegularFrame( ByteBuffer buffer ) throws Inva
 		}
 		if( readingState ) {
 			FramedataImpl1 curframe = new FramedataImpl1();
+			currentFrame.flip();
 			curframe.setPayload( currentFrame );
 			curframe.setFin( false );
 			curframe.setOptcode( inframe ? Opcode.CONTINIOUS : Opcode.TEXT );
diff --git a/src/org/java_websocket/framing/FramedataImpl1.java b/src/org/java_websocket/framing/FramedataImpl1.java
@@ -85,15 +85,16 @@ public void append( Framedata nextframe ) throws InvalidFrameException {
 			b.mark();
 			unmaskedpayload.position( unmaskedpayload.limit() );
 			unmaskedpayload.limit( unmaskedpayload.capacity() );
-			if( unmaskedpayload.hasRemaining() )
-				unmaskedpayload.put( b );
-			if( b.hasRemaining() ) {
+
+			if( b.remaining() > unmaskedpayload.remaining() ) {
 				ByteBuffer tmp = ByteBuffer.allocate( b.remaining() + unmaskedpayload.capacity() );
 				unmaskedpayload.flip();
 				tmp.put( unmaskedpayload );
 				tmp.put( b );
 				unmaskedpayload = tmp;
 
+			} else {
+				unmaskedpayload.put( b );
 			}
 			unmaskedpayload.rewind();
 			b.reset();
@@ -103,7 +104,7 @@ public void append( Framedata nextframe ) throws InvalidFrameException {
 
 	@Override
 	public String toString() {
-		return "Framedata{ optcode:" + getOpcode() + ", fin:" + isFin() + ", payloadlength:" + unmaskedpayload.limit() + ", payload:" + Arrays.toString(Charsetfunctions.utf8Bytes( new String( unmaskedpayload.array() ) ) ) + "}";
+		return "Framedata{ optcode:" + getOpcode() + ", fin:" + isFin() + ", payloadlength:" + unmaskedpayload.limit() + ", payload:" + Arrays.toString( Charsetfunctions.utf8Bytes( new String( unmaskedpayload.array() ) ) ) + "}";
 	}
 
 }

Original file line number	Diff line number	Diff line change
`@@ -158,6 +158,7 @@ protected List<Framedata> translateRegularFrame( ByteBuffer buffer ) throws Inva`
`158`	`158`	`}`
`159`	`159`	`if( readingState ) {`
`160`	`160`	`FramedataImpl1 curframe = new FramedataImpl1();`
	`161`	`+ currentFrame.flip();`
`161`	`162`	`curframe.setPayload( currentFrame );`
`162`	`163`	`curframe.setFin( false );`
`163`	`164`	`curframe.setOptcode( inframe ? Opcode.CONTINIOUS : Opcode.TEXT );`