Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing aggregate message echo test

This commit is contained in:
Joakim Erdfelt 2012-07-18 13:23:07 -07:00
parent 1c77ef0723
commit 796e240545
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/WebSocketFrame.java
View File

@ -139,6 +139,8 @@ public class WebSocketFrame implements Frame
mask = new byte[copy.mask.length];
System.arraycopy(copy.mask,0,mask,0,mask.length);
}
payloadLength = copy.payloadLength;
payloadStart = copy.payloadStart;
data = copy.data.slice();
continuationIndex = copy.continuationIndex;
continuation = copy.continuation;

4
jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketServletRFCTest.java
View File

@ -24,7 +24,6 @@ import java.util.Arrays;
import java.util.Queue;
import java.util.concurrent.TimeUnit;
import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.FutureCallback;
import org.eclipse.jetty.util.Utf8Appendable.NotUtf8Exception;
import org.eclipse.jetty.util.Utf8StringBuilder;
@ -321,7 +320,6 @@ public class WebSocketServletRFCTest
WebSocketFrame bin = WebSocketFrame.binary(buf).setFin(true);
ByteBuffer bb = generator.generate(bin);
BufferUtil.flipToFlush(bb,0);
try
{
client.writeRaw(bb);
@ -363,7 +361,6 @@ public class WebSocketServletRFCTest
WebSocketFrame text = WebSocketFrame.text().setPayload(buf).setFin(true);
ByteBuffer bb = generator.generate(text);
BufferUtil.flipToFlush(bb,0);
try
{
client.writeRaw(bb);
@ -402,7 +399,6 @@ public class WebSocketServletRFCTest
WebSocketFrame txt = WebSocketFrame.text().setPayload(buf);
ByteBuffer bb = generator.generate(txt);
BufferUtil.flipToFlush(bb,0);
client.writeRaw(bb);
Queue<WebSocketFrame> frames = client.readFrames(1,TimeUnit.SECONDS,1);

3
jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/blockhead/BlockheadClient.java
View File

@ -416,8 +416,7 @@ public class BlockheadClient implements IncomingFrames
{
LOG.debug("writing out: {}",BufferUtil.toDetailString(buf));
}
byte arr[] = BufferUtil.toArray(buf);
out.write(arr,0,arr.length);
BufferUtil.writeTo(buf,out);
out.flush();
if (frame.getOpCode() == OpCode.CLOSE)