diff options
author | Greg Wilkins | 2015-01-01 15:18:13 +0000 |
---|---|---|
committer | Greg Wilkins | 2015-01-01 15:18:13 +0000 |
commit | 3af9b145a30d5515681a9e01c542af78c12247d3 (patch) | |
tree | 26ef0ef6eab808ce7439b74af21e1348ca1b63fc /jetty-spdy | |
parent | 20fc880c3eda2d70ded1b2f3de956464a86b983e (diff) | |
download | org.eclipse.jetty.project-3af9b145a30d5515681a9e01c542af78c12247d3.tar.gz org.eclipse.jetty.project-3af9b145a30d5515681a9e01c542af78c12247d3.tar.xz org.eclipse.jetty.project-3af9b145a30d5515681a9e01c542af78c12247d3.zip |
Deprecated the AbstractConnection dispatchIO mechanism
Diffstat (limited to 'jetty-spdy')
5 files changed, 17 insertions, 15 deletions
diff --git a/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYClientConnectionFactory.java b/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYClientConnectionFactory.java index 55b3df2642..89456d9255 100644 --- a/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYClientConnectionFactory.java +++ b/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYClientConnectionFactory.java @@ -52,7 +52,7 @@ public class SPDYClientConnectionFactory implements ClientConnectionFactory Parser parser = new Parser(compressionFactory.newDecompressor()); Generator generator = new Generator(byteBufferPool, compressionFactory.newCompressor()); - SPDYConnection connection = new ClientSPDYConnection(endPoint, byteBufferPool, parser, factory, client.isDispatchIO()); + SPDYConnection connection = new ClientSPDYConnection(endPoint, byteBufferPool, parser, factory); FlowControlStrategy flowControlStrategy = client.newFlowControlStrategy(); @@ -75,9 +75,9 @@ public class SPDYClientConnectionFactory implements ClientConnectionFactory { private final Factory factory; - public ClientSPDYConnection(EndPoint endPoint, ByteBufferPool bufferPool, Parser parser, Factory factory, boolean dispatchIO) + public ClientSPDYConnection(EndPoint endPoint, ByteBufferPool bufferPool, Parser parser, Factory factory) { - super(endPoint, bufferPool, parser, factory.getExecutor(), dispatchIO); + super(endPoint, bufferPool, parser, factory.getExecutor()); this.factory = factory; } diff --git a/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYConnection.java b/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYConnection.java index 52bc964278..40bd9606b4 100644 --- a/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYConnection.java +++ b/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYConnection.java @@ -44,12 +44,12 @@ public class SPDYConnection extends AbstractConnection implements Controller, Id private volatile ISession session; private volatile boolean idle = false; - public SPDYConnection(EndPoint endPoint, ByteBufferPool bufferPool, Parser parser, Executor executor, boolean dispatchIO) + public SPDYConnection(EndPoint endPoint, ByteBufferPool bufferPool, Parser parser, Executor executor) { - this(endPoint, bufferPool, parser, executor, dispatchIO, 8192); + this(endPoint, bufferPool, parser, executor, 8192); } - public SPDYConnection(EndPoint endPoint, ByteBufferPool bufferPool, Parser parser, Executor executor, boolean dispatchIO, int bufferSize) + public SPDYConnection(EndPoint endPoint, ByteBufferPool bufferPool, Parser parser, Executor executor, int bufferSize) { // Since SPDY is multiplexed, onFillable() must never block while calling application code. In fact, // the SPDY code always dispatches to a new thread when calling application code, @@ -57,7 +57,7 @@ public class SPDYConnection extends AbstractConnection implements Controller, Id // The IO operation (read, parse, etc.) will not block and will be fast in almost all cases. // Big uploads to a server, however, might occupy the Selector thread for a long time and // therefore starve other connections, so by default dispatchIO is true. - super(endPoint, executor, dispatchIO); + super(endPoint, executor); this.bufferPool = bufferPool; this.parser = parser; onIdle(true); diff --git a/jetty-spdy/spdy-http-client-transport/src/test/java/org/eclipse/jetty/spdy/client/http/HttpClientCustomProxyTest.java b/jetty-spdy/spdy-http-client-transport/src/test/java/org/eclipse/jetty/spdy/client/http/HttpClientCustomProxyTest.java index 05f532aa7a..5fc1ba81b4 100644 --- a/jetty-spdy/spdy-http-client-transport/src/test/java/org/eclipse/jetty/spdy/client/http/HttpClientCustomProxyTest.java +++ b/jetty-spdy/spdy-http-client-transport/src/test/java/org/eclipse/jetty/spdy/client/http/HttpClientCustomProxyTest.java @@ -24,6 +24,7 @@ import java.nio.ByteBuffer; import java.util.Map; import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; + import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -168,9 +169,10 @@ public class HttpClientCustomProxyTest public CAFEBABEConnection(EndPoint endPoint, Executor executor, ClientConnectionFactory connectionFactory, Map<String, Object> context) { - super(endPoint, executor, true); + super(endPoint, executor); this.connectionFactory = connectionFactory; this.context = context; + throw new IllegalStateException("This was calling super dispatchIO=true. Needs to be reviewed"); } @Override @@ -227,8 +229,10 @@ public class HttpClientCustomProxyTest public CAFEBABEServerConnection(Connector connector, EndPoint endPoint, org.eclipse.jetty.server.ConnectionFactory connectionFactory) { - super(endPoint, connector.getExecutor(), true); + super(endPoint, connector.getExecutor()); this.connectionFactory = connectionFactory; + + throw new IllegalStateException("This was calling super dispatchIO=true. Needs to be reviewed"); } @Override diff --git a/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/ProxyHTTPSPDYConnection.java b/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/ProxyHTTPSPDYConnection.java index 71aec5c13d..1c7dc66654 100644 --- a/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/ProxyHTTPSPDYConnection.java +++ b/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/ProxyHTTPSPDYConnection.java @@ -68,7 +68,7 @@ public class ProxyHTTPSPDYConnection extends HttpConnection implements HttpParse public ProxyHTTPSPDYConnection(Connector connector, HttpConfiguration config, EndPoint endPoint, short version, ProxyEngineSelector proxyEngineSelector) { - super(config, connector, endPoint, false); + super(config, connector, endPoint); this.version = version; this.proxyEngineSelector = proxyEngineSelector; this.session = new HTTPSession(version, connector); diff --git a/jetty-spdy/spdy-server/src/main/java/org/eclipse/jetty/spdy/server/SPDYServerConnectionFactory.java b/jetty-spdy/spdy-server/src/main/java/org/eclipse/jetty/spdy/server/SPDYServerConnectionFactory.java index c4ed673308..aa7e298932 100644 --- a/jetty-spdy/spdy-server/src/main/java/org/eclipse/jetty/spdy/server/SPDYServerConnectionFactory.java +++ b/jetty-spdy/spdy-server/src/main/java/org/eclipse/jetty/spdy/server/SPDYServerConnectionFactory.java @@ -86,8 +86,7 @@ public class SPDYServerConnectionFactory extends AbstractConnectionFactory Generator generator = new Generator(connector.getByteBufferPool(), compressionFactory.newCompressor()); ServerSessionFrameListener listener = provideServerSessionFrameListener(connector, endPoint); - SPDYConnection connection = new ServerSPDYConnection(connector, endPoint, parser, listener, - isDispatchIO(), getInputBufferSize()); + SPDYConnection connection = new ServerSPDYConnection(connector, endPoint, parser, listener, getInputBufferSize()); FlowControlStrategy flowControlStrategy = newFlowControlStrategy(version); @@ -180,10 +179,9 @@ public class SPDYServerConnectionFactory extends AbstractConnectionFactory private final AtomicBoolean connected = new AtomicBoolean(); private ServerSPDYConnection(Connector connector, EndPoint endPoint, Parser parser, - ServerSessionFrameListener listener, boolean dispatchIO, int bufferSize) + ServerSessionFrameListener listener, int bufferSize) { - super(endPoint, connector.getByteBufferPool(), parser, connector.getExecutor(), - dispatchIO, bufferSize); + super(endPoint, connector.getByteBufferPool(), parser, connector.getExecutor(), bufferSize); this.listener = listener; } |