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

Fixing WebSocketAsyncConnection.write() of byte[] arrays

This commit is contained in:
Joakim Erdfelt 2012-07-10 14:45:37 -07:00
parent 4fd7ff76fb
commit 8aa6e5db9b
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/ControlFrameBytes.java
View File

@ -4,7 +4,6 @@ import java.nio.ByteBuffer;
import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.websocket.generator.Generator;
import org.eclipse.jetty.websocket.protocol.OpCode; import org.eclipse.jetty.websocket.protocol.OpCode;
import org.eclipse.jetty.websocket.protocol.WebSocketFrame; import org.eclipse.jetty.websocket.protocol.WebSocketFrame;
@ -34,8 +33,7 @@ public class ControlFrameBytes<C> extends FrameBytes<C>
{ {
if (buffer == null) if (buffer == null)
{ {
buffer = connection.getBufferPool().acquire(frame.getPayloadLength() + Generator.OVERHEAD,false); buffer = connection.getGenerator().generate(frame);
connection.getGenerator().generate(frame);
BufferUtil.flipToFlush(buffer,0); BufferUtil.flipToFlush(buffer,0);
} }
return buffer; return buffer;

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

@ -354,6 +354,7 @@ public class WebSocketFrame implements Frame
data = ByteBuffer.allocate(len); data = ByteBuffer.allocate(len);
BufferUtil.clearToFill(data); BufferUtil.clearToFill(data);
data.put(buf,0,len); data.put(buf,0,len);
BufferUtil.flipToFill(data);
return this; return this;
} }

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

@ -160,7 +160,7 @@ public class WebSocketServletRFCTest
int ccCount = 0; int ccCount = 0;
ByteBuffer echod = binmsg.getPayload(); ByteBuffer echod = binmsg.getPayload();
while (echod.remaining() > 1) while (echod.remaining() >= 1)
{ {
byte b = echod.get(); byte b = echod.get();
switch (b) switch (b)