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

Merge remote-tracking branch 'origin/copyByteBuffer'

This commit is contained in:
Greg Wilkins 2012-10-25 10:11:55 +11:00
parent 975a20271f 35b7a0a62d
commit 71d7c6ff08
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,12 +96,12 @@ public class HttpTransportOverSPDY implements HttpTransport
} }
} }
boolean noContent = BufferUtil.isEmpty(content); boolean hasContent = !BufferUtil.isEmpty(content);
boolean close = noContent && lastContent; boolean close = !hasContent && lastContent;
reply(stream, new ReplyInfo(headers, close)); reply(stream, new ReplyInfo(headers, close));
if (!noContent) if (hasContent)
stream.data(new ByteBufferDataInfo(content, lastContent)); sendToStream(content, lastContent);
} }
@Override @Override
@ -111,7 +111,20 @@ public class HttpTransportOverSPDY implements HttpTransport
// TODO work out if we can avoid double calls for lastContent==true // TODO work out if we can avoid double calls for lastContent==true
if (stream.isClosed() && BufferUtil.isEmpty(content) && lastContent) if (stream.isClosed() && BufferUtil.isEmpty(content) && lastContent)
return; return;
stream.data(new ByteBufferDataInfo(content, lastContent));
sendToStream(content, lastContent);
}
private void sendToStream(ByteBuffer content, boolean lastContent)
{
try
{
stream.data(new ByteBufferDataInfo(content, lastContent)).get();
}
catch (Exception e)
{
endPoint.close();
}
} }
@Override @Override