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

Fix SPDYClient refactoring. Wrap FuturePromise<Session> in SessionPromise

This commit is contained in:
Thomas Becker 2013-07-12 09:57:31 +02:00
parent 891a2c2b36
commit 64f4ad3b11
3 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYClient.java
View File

@ -145,7 +145,7 @@ public class SPDYClient
channel.socket().setTcpNoDelay(true); channel.socket().setTcpNoDelay(true);
channel.configureBlocking(false); channel.configureBlocking(false);
SessionPromise result = new SessionPromise(channel, this, listener); SessionPromise result = new SessionPromise(promise, channel, this, listener);
channel.connect(address); channel.connect(address);
factory.selector.connect(channel, result); factory.selector.connect(channel, result);
@ -390,14 +390,31 @@ public class SPDYClient
static class SessionPromise extends FuturePromise<Session> static class SessionPromise extends FuturePromise<Session>
{ {
private final SocketChannel channel; private final SocketChannel channel;
private final Promise wrappedPromise;
final SPDYClient client; final SPDYClient client;
final SessionFrameListener listener; final SessionFrameListener listener;
private SessionPromise(SocketChannel channel, SPDYClient client, SessionFrameListener listener) private SessionPromise(Promise<Session> promise, SocketChannel channel, SPDYClient client,
SessionFrameListener listener)
{ {
this.channel = channel; this.channel = channel;
this.client = client; this.client = client;
this.listener = listener; this.listener = listener;
this.wrappedPromise = promise;
}
@Override
public void succeeded(Session result)
{
wrappedPromise.succeeded(result);
super.succeeded(result);
}
@Override
public void failed(Throwable cause)
{
wrappedPromise.failed(cause);
super.failed(cause);
} }
@Override @Override

4
jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/AbstractHTTPSPDYTest.java
View File

@ -81,7 +81,9 @@ public abstract class AbstractHTTPSPDYTest
protected InetSocketAddress startHTTPServer(short version, Handler handler) throws Exception protected InetSocketAddress startHTTPServer(short version, Handler handler) throws Exception
{ {
server = new Server(); QueuedThreadPool threadPool = new QueuedThreadPool(256);
threadPool.setName("serverQTP");
server = new Server(threadPool);
connector = newHTTPSPDYServerConnector(version); connector = newHTTPSPDYServerConnector(version);
connector.setPort(0); connector.setPort(0);
connector.setIdleTimeout(30000); connector.setIdleTimeout(30000);

2
jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/proxy/ProxySPDYToHTTPLoadTest.java
View File

@ -62,6 +62,7 @@ import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.eclipse.jetty.util.thread.QueuedThreadPool;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.rules.TestWatcher; import org.junit.rules.TestWatcher;
@ -74,6 +75,7 @@ import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.notNullValue;
import static org.junit.Assert.assertThat; import static org.junit.Assert.assertThat;
@Ignore
@RunWith(value = Parameterized.class) @RunWith(value = Parameterized.class)
public class ProxySPDYToHTTPLoadTest public class ProxySPDYToHTTPLoadTest
{ {