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

Fixing write of byte buffer

This commit is contained in:
Joakim Erdfelt 2012-07-06 10:06:05 -07:00
parent ae56940796
commit 84fa1163e9
4 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/driver/WebSocketEventDriver.java
View File

@ -16,7 +16,6 @@ import org.eclipse.jetty.websocket.api.WebSocketException;
import org.eclipse.jetty.websocket.api.WebSocketListener;
import org.eclipse.jetty.websocket.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.frames.BaseFrame;
import org.eclipse.jetty.websocket.frames.BinaryFrame;
import org.eclipse.jetty.websocket.frames.CloseFrame;
import org.eclipse.jetty.websocket.frames.DataFrame;
import org.eclipse.jetty.websocket.io.MessageInputStream;
@ -277,24 +276,6 @@ public class WebSocketEventDriver implements Parser.Listener
}
}
}
// Specified Binary Case
if ((frame instanceof BinaryFrame) && (events.onBinary != null))
{
BinaryFrame bin = (BinaryFrame)frame;
if (events.onBinary.isStreaming())
{
// Streaming Approach
}
else
{
// Byte array approach
byte buf[] = BufferUtil.toArray(bin.getPayload());
events.onBinary.call(websocket,connection,buf,0,buf.length);
}
return;
}
}
catch (Throwable t)
{

2
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/frames/BinaryFrame.java
View File

@ -33,7 +33,7 @@ public class BinaryFrame extends DataFrame
public BinaryFrame(byte[] data, int offset, int length)
{
this();
setPayload(ByteBuffer.wrap(data,offset,length));
setPayload(data,offset,length);
}
/**

2
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/parser/Parser.java
View File

@ -135,6 +135,8 @@ public class Parser
{
throw new ProtocolException("Fragment continuation frame without prior !FIN");
}
// Be careful to use the original opcode
opcode = parser.getFrame().getOpCode();
}
if (parser == null)

4
jetty-websocket/websocket-server/src/test/resources/jetty-logging.properties
View File

@ -1,4 +1,6 @@
org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog
org.eclipse.jetty.io.LEVEL=DEBUG
org.eclipse.jetty.io.LEVEL=INFO
org.eclipse.jetty.io.SelectorManager.LEVEL=INFO
org.eclipse.jetty.websocket.LEVEL=DEBUG
org.eclipse.jetty.websocket.generator.LEVEL=DEBUG
org.eclipse.jetty.websocket.server.blockhead.LEVEL=DEBUG