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

394370 392237 reverted Improved handling of SPDY async send. Added simple NPE protection to further investigate problem

This commit is contained in:
Greg Wilkins 2012-11-16 10:55:10 +11:00
parent b5c6555a4a
commit 62e033fcd0
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,7 +69,7 @@ public class HttpTransportOverSPDY implements HttpTransport
@Override @Override
public <C> void send(HttpGenerator.ResponseInfo info, ByteBuffer content, boolean lastContent, C context, Callback<C> callback) public <C> void send(HttpGenerator.ResponseInfo info, ByteBuffer content, boolean lastContent, C context, Callback<C> callback)
{ {
// info==null content==null lastContent==false should not happen // info==null content==null lastContent==false should not happen
// info==null content==null lastContent==true signals no more content - complete // info==null content==null lastContent==true signals no more content - complete
// info==null content!=null lastContent==false send data on committed response // info==null content!=null lastContent==false send data on committed response
@ -116,21 +116,17 @@ public class HttpTransportOverSPDY implements HttpTransport
boolean close = !hasContent && lastContent; boolean close = !hasContent && lastContent;
reply(stream, new ReplyInfo(headers, close)); reply(stream, new ReplyInfo(headers, close));
} }
if (stream.isClosed()) if ((hasContent || lastContent ) && !stream.isClosed() )
{
callback.failed(context,new EofException());
}
else if (hasContent)
{ {
if (content==null)
content=BufferUtil.EMPTY_BUFFER;
stream.data(new ByteBufferDataInfo(content, lastContent),endPoint.getIdleTimeout(),TimeUnit.MILLISECONDS,context,callback); stream.data(new ByteBufferDataInfo(content, lastContent),endPoint.getIdleTimeout(),TimeUnit.MILLISECONDS,context,callback);
} }
else if (lastContent)
{
stream.data(new ByteBufferDataInfo(BufferUtil.EMPTY_BUFFER, lastContent),endPoint.getIdleTimeout(),TimeUnit.MILLISECONDS,context,callback);
}
else else
callback.completed(context); callback.completed(context);
} }
@Override @Override