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

Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9

This commit is contained in:
Joakim Erdfelt 2012-06-19 14:38:15 -07:00
parent 03a1b68f38 8e1645f06b
commit 8065d04a0d
1 changed files with 2 additions and 0 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/generator/FrameGenerator.java
View File

@ -72,6 +72,8 @@ public abstract class FrameGenerator<T extends BaseFrame>
ByteBuffer buffer = ByteBuffer.allocate(buflen); ByteBuffer buffer = ByteBuffer.allocate(buflen);
// TODO: figure out how to get this from a bytebuffer pool // TODO: figure out how to get this from a bytebuffer pool
buffer.put(framing);
generatePayload(buffer, frame); generatePayload(buffer, frame);
return buffer; return buffer;
} }