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

Fixing some server tests

This commit is contained in:
Joakim Erdfelt 2012-07-10 14:33:50 -07:00
parent 5d796488e2
commit eb07c173ca
4 changed files with 16 additions and 4 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/io/ControlFrameBytes.java
View File

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

2
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/DataFrameBytes.java
View File

@ -2,6 +2,7 @@ package org.eclipse.jetty.websocket.io;
import java.nio.ByteBuffer;
import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.websocket.protocol.WebSocketFrame;
@ -48,6 +49,7 @@ public class DataFrameBytes<C> extends FrameBytes<C>
}
buffer = connection.getGenerator().generate(size,frame);
BufferUtil.flipToFlush(buffer,0);
return buffer;
}
catch (Throwable x)

7
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/WebSocketAsyncConnection.java
View File

@ -101,8 +101,9 @@ public class WebSocketAsyncConnection extends AbstractAsyncConnection implements
}
catch (IOException e)
{
LOG.warn(e);
terminateConnection(StatusCode.PROTOCOL,e.getMessage());
return 0;
return -1;
}
}
@ -214,10 +215,9 @@ public class WebSocketAsyncConnection extends AbstractAsyncConnection implements
@Override
public void onFillable()
{
LOG.debug("onFillable");
setCurrentConnection(this);
ByteBuffer buffer = bufferPool.acquire(policy.getBufferSize(),false);
BufferUtil.clearToFill(buffer);
BufferUtil.clear(buffer);
try
{
read(buffer);
@ -264,6 +264,7 @@ public class WebSocketAsyncConnection extends AbstractAsyncConnection implements
break;
}
LOG.debug("Filled {} bytes - {}",filled,BufferUtil.toDetailString(buffer));
parser.parse(buffer);
}
}

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

@ -355,9 +355,16 @@ public class BlockheadClient implements Parser.Listener
{
LOG.debug("write(Frame->{})",frame);
frame.setMask(clientmask);
// frame.setMask(new byte[] { 0x00, 0x00, 0x00, 0x00 });
ByteBuffer buf = generator.generate(frame);
BufferUtil.flipToFlush(buf,0);
BufferUtil.writeTo(buf,out);
if (LOG.isDebugEnabled())
{
LOG.debug("writing out: {}",BufferUtil.toDetailString(buf));
}
byte arr[] = BufferUtil.toArray(buf);
out.write(arr,0,arr.length);
out.flush();
}
public void writeRaw(ByteBuffer buf) throws IOException