diff options
| author | Greg Wilkins | 2012-11-29 05:32:44 +0000 |
|---|---|---|
| committer | Greg Wilkins | 2012-11-29 06:03:40 +0000 |
| commit | 21f717078c40e73a6a2ec95f45baf59598710824 (patch) | |
| tree | f51008fabfb9b340112a0f740af17565d62db20e | |
| parent | 9931ddec9457a0a1d479264e22ccf08c32ca629d (diff) | |
| download | org.eclipse.jetty.project-21f717078c40e73a6a2ec95f45baf59598710824.tar.gz org.eclipse.jetty.project-21f717078c40e73a6a2ec95f45baf59598710824.tar.xz org.eclipse.jetty.project-21f717078c40e73a6a2ec95f45baf59598710824.zip | |
jetty-9 handle null push strategy
3 files changed, 3 insertions, 3 deletions
diff --git a/jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardSession.java b/jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardSession.java index a54b1e068d..bab3b9197c 100644 --- a/jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardSession.java +++ b/jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardSession.java @@ -894,7 +894,7 @@ public class StandardSession implements ISession, Parser.Listener, Dumpable { if (flushing || queue.isEmpty()) return; - + Set<IStream> stalledStreams = null; for (int i = 0; i < queue.size(); ++i) { diff --git a/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HttpTransportOverSPDY.java b/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HttpTransportOverSPDY.java index 5deac20f77..28110a07aa 100644 --- a/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HttpTransportOverSPDY.java +++ b/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HttpTransportOverSPDY.java @@ -67,7 +67,7 @@ public class HttpTransportOverSPDY implements HttpTransport this.connector = connector; this.configuration = configuration; this.endPoint = endPoint; - this.pushStrategy = pushStrategy; + this.pushStrategy = pushStrategy==null?new PushStrategy.None():pushStrategy; this.stream = stream; this.requestHeaders = requestHeaders; } diff --git a/tests/test-webapps/test-jetty-webapp/src/test/java/org/eclipse/jetty/TestServer.java b/tests/test-webapps/test-jetty-webapp/src/test/java/org/eclipse/jetty/TestServer.java index 9db3b74b53..b794a0ba7c 100644 --- a/tests/test-webapps/test-jetty-webapp/src/test/java/org/eclipse/jetty/TestServer.java +++ b/tests/test-webapps/test-jetty-webapp/src/test/java/org/eclipse/jetty/TestServer.java @@ -118,7 +118,7 @@ public class TestServer // Spdy Connector SPDYServerConnectionFactory.checkNPNAvailable(); - PushStrategy push = new ReferrerPushStrategy(); + PushStrategy push = null; /*new ReferrerPushStrategy();*/ HTTPSPDYServerConnectionFactory spdy2 = new HTTPSPDYServerConnectionFactory(2,config,push); spdy2.setInputBufferSize(8192); spdy2.setInitialWindowSize(32768); |