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

jetty-9 handle null push strategy

This commit is contained in:
Greg Wilkins 2012-11-29 16:32:44 +11:00
parent 9931ddec94
commit 21f717078c
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardSession.java
View File

@ -894,7 +894,7 @@ public class StandardSession implements ISession, Parser.Listener, Dumpable
{ {
if (flushing || queue.isEmpty()) if (flushing || queue.isEmpty())
return; return;
Set<IStream> stalledStreams = null; Set<IStream> stalledStreams = null;
for (int i = 0; i < queue.size(); ++i) for (int i = 0; i < queue.size(); ++i)
{ {

2
jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HttpTransportOverSPDY.java
View File

@ -67,7 +67,7 @@ public class HttpTransportOverSPDY implements HttpTransport
this.connector = connector; this.connector = connector;
this.configuration = configuration; this.configuration = configuration;
this.endPoint = endPoint; this.endPoint = endPoint;
this.pushStrategy = pushStrategy; this.pushStrategy = pushStrategy==null?new PushStrategy.None():pushStrategy;
this.stream = stream; this.stream = stream;
this.requestHeaders = requestHeaders; this.requestHeaders = requestHeaders;
} }

2
tests/test-webapps/test-jetty-webapp/src/test/java/org/eclipse/jetty/TestServer.java
View File

@ -118,7 +118,7 @@ public class TestServer
// Spdy Connector // Spdy Connector
SPDYServerConnectionFactory.checkNPNAvailable(); SPDYServerConnectionFactory.checkNPNAvailable();
PushStrategy push = new ReferrerPushStrategy(); PushStrategy push = null; /*new ReferrerPushStrategy();*/
HTTPSPDYServerConnectionFactory spdy2 = new HTTPSPDYServerConnectionFactory(2,config,push); HTTPSPDYServerConnectionFactory spdy2 = new HTTPSPDYServerConnectionFactory(2,config,push);
spdy2.setInputBufferSize(8192); spdy2.setInputBufferSize(8192);
spdy2.setInitialWindowSize(32768); spdy2.setInitialWindowSize(32768);