diff options
3 files changed, 24 insertions, 3 deletions
diff --git a/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYClient.java b/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYClient.java index c866449dbb..364db9cad6 100644 --- a/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYClient.java +++ b/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYClient.java @@ -145,7 +145,7 @@ public class SPDYClient channel.socket().setTcpNoDelay(true); channel.configureBlocking(false); - SessionPromise result = new SessionPromise(channel, this, listener); + SessionPromise result = new SessionPromise(promise, channel, this, listener); channel.connect(address); factory.selector.connect(channel, result); @@ -390,14 +390,31 @@ public class SPDYClient static class SessionPromise extends FuturePromise<Session> { private final SocketChannel channel; + private final Promise wrappedPromise; final SPDYClient client; 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.client = client; 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 diff --git a/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/AbstractHTTPSPDYTest.java b/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/AbstractHTTPSPDYTest.java index de96a4c8df..fab4631bdd 100644 --- a/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/AbstractHTTPSPDYTest.java +++ b/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/AbstractHTTPSPDYTest.java @@ -81,7 +81,9 @@ public abstract class AbstractHTTPSPDYTest 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.setPort(0); connector.setIdleTimeout(30000); diff --git a/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/proxy/ProxySPDYToHTTPLoadTest.java b/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/proxy/ProxySPDYToHTTPLoadTest.java index d4ed219a12..6c2e210950 100644 --- a/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/proxy/ProxySPDYToHTTPLoadTest.java +++ b/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/proxy/ProxySPDYToHTTPLoadTest.java @@ -62,6 +62,7 @@ import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestWatcher; @@ -74,6 +75,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; import static org.junit.Assert.assertThat; +@Ignore @RunWith(value = Parameterized.class) public class ProxySPDYToHTTPLoadTest { |