Fixed minor issue with sending binary/fragmented frames when buffer

Davidiusdadi · Davidiusdadi · commit 4e27fa8c13e6 · 2013-08-08T22:32:59.000+02:00
position is not 0.
diff --git a/src/main/java/org/java_websocket/drafts/Draft_10.java b/src/main/java/org/java_websocket/drafts/Draft_10.java
@@ -31,13 +31,12 @@
 public class Draft_10 extends Draft {
 
 	private class IncompleteException extends Throwable {
-		
+
 		/**
 		 * It's Serializable.
 		 */
 		private static final long serialVersionUID = 7330519489840500997L;
-		
-		
+
 		private int preferedsize;
 		public IncompleteException( int preferedsize ) {
 			this.preferedsize = preferedsize;
@@ -63,7 +62,7 @@ public static int readVersion( Handshakedata handshakedata ) {
 
 	private ByteBuffer incompleteframe;
 	private Framedata fragmentedframe = null;
-	
+
 	private final Random reuseableRandom = new Random();
 
 	@Override
@@ -117,7 +116,7 @@ public ByteBuffer createBinaryFrame( Framedata framedata ) {
 			ByteBuffer maskkey = ByteBuffer.allocate( 4 );
 			maskkey.putInt( reuseableRandom.nextInt() );
 			buf.put( maskkey.array() );
-			for( int i = 0 ; i < mes.limit() ; i++ ) {
+			for( int i = 0 ; mes.hasRemaining() ; i++ ) {
 				buf.put( (byte) ( mes.get() ^ maskkey.get( i % 4 ) ) );
 			}
 		} else
diff --git a/src/main/java/org/java_websocket/framing/FramedataImpl1.java b/src/main/java/org/java_websocket/framing/FramedataImpl1.java
@@ -104,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:[pos:" + unmaskedpayload.position() + ", len:" + unmaskedpayload.remaining() + "], payload:" + Arrays.toString( Charsetfunctions.utf8Bytes( new String( unmaskedpayload.array() ) ) ) + "}";
 	}
 
 }

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ public void append( Framedata nextframe ) throws InvalidFrameException {`
`104`	`104`
`105`	`105`	`@Override`
`106`	`106`	`public String toString() {`
`107`		`- return "Framedata{ optcode:" + getOpcode() + ", fin:" + isFin() + ", payloadlength:" + unmaskedpayload.limit() + ", payload:" + Arrays.toString( Charsetfunctions.utf8Bytes( new String( unmaskedpayload.array() ) ) ) + "}";`
	`107`	`+ return "Framedata{ optcode:" + getOpcode() + ", fin:" + isFin() + ", payloadlength:[pos:" + unmaskedpayload.position() + ", len:" + unmaskedpayload.remaining() + "], payload:" + Arrays.toString( Charsetfunctions.utf8Bytes( new String( unmaskedpayload.array() ) ) ) + "}";`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`}`