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

Fixing build issue

This commit is contained in:
Joakim Erdfelt 2012-07-10 11:53:10 -07:00
parent d6139b8978
commit cd0edafa68
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/io/WebSocketBlockingConnection.java
View File

@ -7,7 +7,6 @@ import org.eclipse.jetty.util.FutureCallback;
import org.eclipse.jetty.websocket.api.WebSocketConnection;
import org.eclipse.jetty.websocket.io.DataFrameBytes;
import org.eclipse.jetty.websocket.io.RawConnection;
import org.eclipse.jetty.websocket.protocol.FrameBuilder;
import org.eclipse.jetty.websocket.protocol.WebSocketFrame;
/**
@ -38,7 +37,7 @@ public class WebSocketBlockingConnection
*/
public void write(byte[] data, int offset, int length) throws IOException
{
WebSocketFrame frame = FrameBuilder.binary(data,offset,length).asFrame();
WebSocketFrame frame = WebSocketFrame.binary().setPayload(data,offset,length);
try
{
FutureCallback<Void> blocking = new FutureCallback<>();
@ -63,7 +62,7 @@ public class WebSocketBlockingConnection
*/
public void write(String message) throws IOException
{
WebSocketFrame frame = FrameBuilder.text(message).asFrame();
WebSocketFrame frame = WebSocketFrame.text(message);
try
{
FutureCallback<Void> blocking = new FutureCallback<>();

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

@ -15,16 +15,17 @@ import org.eclipse.jetty.io.AsyncEndPoint;
import org.eclipse.jetty.io.ByteBufferPool;
import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.util.FutureCallback;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.api.StatusCode;
import org.eclipse.jetty.websocket.api.WebSocketConnection;
import org.eclipse.jetty.websocket.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.callbacks.WebSocketCloseCallback;
import org.eclipse.jetty.websocket.generator.Generator;
import org.eclipse.jetty.websocket.parser.Parser;
import org.eclipse.jetty.websocket.protocol.CloseInfo;
import org.eclipse.jetty.websocket.protocol.ExtensionConfig;
import org.eclipse.jetty.websocket.protocol.FrameBuilder;
import org.eclipse.jetty.websocket.protocol.OpCode;
import org.eclipse.jetty.websocket.protocol.WebSocketFrame;
/**
@ -241,7 +242,7 @@ public class WebSocketAsyncConnection extends AbstractAsyncConnection implements
@Override
public <C> void ping(C context, Callback<C> callback, byte[] payload) throws IOException
{
WebSocketFrame frame = FrameBuilder.ping().payload(payload).asFrame();
WebSocketFrame frame = new WebSocketFrame(OpCode.PING).setPayload(payload);
ControlFrameBytes<C> bytes = new ControlFrameBytes<C>(this,callback,context,frame);
scheduleTimeout(bytes);
queue.prepend(bytes);
@ -298,11 +299,11 @@ public class WebSocketAsyncConnection extends AbstractAsyncConnection implements
*/
private void terminateConnection(int statusCode, String reason)
{
WebSocketFrame close = FrameBuilder.close(statusCode,reason).asFrame();
ByteBuffer buf = generator.generate(close);
BufferUtil.flipToFlush(buf,0);
getEndPoint().write(null,new WebSocketCloseCallback(this,buf),buf);
CloseInfo close = new CloseInfo(statusCode,reason);
FutureCallback<Void> nop = new FutureCallback<>();
ControlFrameBytes<Void> frameBytes = new ControlFrameBytes<Void>(this,nop,null,close.asFrame());
queue.prepend(frameBytes);
flush();
}
@Override
@ -333,10 +334,11 @@ public class WebSocketAsyncConnection extends AbstractAsyncConnection implements
return;
}
WebSocketFrame frame = FrameBuilder.binary(buf,offset,len).fin(true).asFrame();
WebSocketFrame frame = WebSocketFrame.binary().setPayload(buf,offset,len);
DataFrameBytes<C> bytes = new DataFrameBytes<C>(this,callback,context,frame);
scheduleTimeout(bytes);
queue.append(bytes);
flush();
}
/**
@ -350,9 +352,10 @@ public class WebSocketAsyncConnection extends AbstractAsyncConnection implements
LOG.debug("write(context,{},message.length:{})",callback,message.length());
}
WebSocketFrame frame = FrameBuilder.text(message).fin(true).asFrame();
WebSocketFrame frame = WebSocketFrame.text(message);
DataFrameBytes<C> bytes = new DataFrameBytes<C>(this,callback,context,frame);
scheduleTimeout(bytes);
queue.append(bytes);
flush();
}
}