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

Fixing connection.onOpen()

This commit is contained in:
Joakim Erdfelt 2012-09-14 15:10:54 -07:00
parent 859d4a09d3
commit 515804a463
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/internal/io/UpgradeConnection.java
View File

@ -36,7 +36,6 @@ import org.eclipse.jetty.util.QuotedStringTokenizer;
import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.StringUtil;
import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.util.thread.Scheduler;
import org.eclipse.jetty.websocket.api.Extension; import org.eclipse.jetty.websocket.api.Extension;
import org.eclipse.jetty.websocket.api.UpgradeException; import org.eclipse.jetty.websocket.api.UpgradeException;
import org.eclipse.jetty.websocket.api.UpgradeResponse; import org.eclipse.jetty.websocket.api.UpgradeResponse;
@ -82,7 +81,6 @@ public class UpgradeConnection extends AbstractConnection
private static final Logger LOG = Log.getLogger(UpgradeConnection.class); private static final Logger LOG = Log.getLogger(UpgradeConnection.class);
private final ByteBufferPool bufferPool; private final ByteBufferPool bufferPool;
private final Scheduler scheduler;
private final IWebSocketClient client; private final IWebSocketClient client;
private final HttpResponseHeaderParser parser; private final HttpResponseHeaderParser parser;
private ClientUpgradeRequest request; private ClientUpgradeRequest request;
@ -92,7 +90,6 @@ public class UpgradeConnection extends AbstractConnection
super(endp,executor); super(endp,executor);
this.client = client; this.client = client;
this.bufferPool = client.getFactory().getBufferPool(); this.bufferPool = client.getFactory().getBufferPool();
this.scheduler = client.getFactory().getScheduler();
this.parser = new HttpResponseHeaderParser(); this.parser = new HttpResponseHeaderParser();
try try
@ -278,6 +275,7 @@ public class UpgradeConnection extends AbstractConnection
// Now swap out the connection // Now swap out the connection
endp.setConnection(connection); endp.setConnection(connection);
connection.onOpen();
} }
private void validateResponse(UpgradeResponse response) private void validateResponse(UpgradeResponse response)