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

Improved the server transport implementation, and fixed a case where 

the end stream flag was erroneously sent with more content to send.
This commit is contained in:
Simone Bordet 2014-06-21 12:10:13 +02:00
parent 72e0d800ac
commit 86b0d77338
1 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HttpTransportOverHTTP2.java
View File

@ -39,6 +39,7 @@ public class HttpTransportOverHTTP2 implements HttpTransport
private static final Logger LOG = Log.getLogger(HttpTransportOverHTTP2.class); private static final Logger LOG = Log.getLogger(HttpTransportOverHTTP2.class);
private final AtomicBoolean commit = new AtomicBoolean(); private final AtomicBoolean commit = new AtomicBoolean();
private final Callback commitCallback = new CommitCallback();
private final IStream stream; private final IStream stream;
private final HeadersFrame request; private final HeadersFrame request;
@ -57,18 +58,12 @@ public class HttpTransportOverHTTP2 implements HttpTransport
if (commit.compareAndSet(false, true)) if (commit.compareAndSet(false, true))
{ {
commit(info, !hasContent, !hasContent ? callback : new Callback.Adapter() boolean endStream = !hasContent && lastContent;
{ commit(info, endStream, !hasContent ? callback : commitCallback);
@Override
public void failed(Throwable x)
{
// TODO
}
});
} }
else else
{ {
// TODO callback.failed(new IllegalStateException());
} }
if (hasContent) if (hasContent)
@ -82,7 +77,8 @@ public class HttpTransportOverHTTP2 implements HttpTransport
if (LOG.isDebugEnabled()) if (LOG.isDebugEnabled())
{ {
LOG.debug("HTTP2 Response #{}:{}{} {}{}{}", LOG.debug("HTTP2 Response #{}:{}{} {}{}{}",
stream.getId(), System.lineSeparator(), HttpVersion.HTTP_2, info.getStatus(), System.lineSeparator(), info.getHttpFields()); stream.getId(), System.lineSeparator(), HttpVersion.HTTP_2, info.getStatus(),
System.lineSeparator(), info.getHttpFields());
} }
MetaData metaData = new MetaData.Response(HttpVersion.HTTP_2, info.getStatus(), info.getHttpFields()); MetaData metaData = new MetaData.Response(HttpVersion.HTTP_2, info.getStatus(), info.getHttpFields());
@ -98,7 +94,6 @@ public class HttpTransportOverHTTP2 implements HttpTransport
LOG.debug("HTTP2 Response #{}: {} content bytes{}", LOG.debug("HTTP2 Response #{}: {} content bytes{}",
stream.getId(), content.remaining(), lastContent ? " (last chunk)" : ""); stream.getId(), content.remaining(), lastContent ? " (last chunk)" : "");
} }
DataFrame frame = new DataFrame(stream.getId(), content, lastContent); DataFrame frame = new DataFrame(stream.getId(), content, lastContent);
stream.data(frame, callback); stream.data(frame, callback);
} }
@ -111,5 +106,26 @@ public class HttpTransportOverHTTP2 implements HttpTransport
@Override @Override
public void abort() public void abort()
{ {
if (LOG.isDebugEnabled())
LOG.debug("HTTP2 Response #{} aborted");
stream.getSession().disconnect();
}
private class CommitCallback implements Callback
{
@Override
public void succeeded()
{
if (LOG.isDebugEnabled())
LOG.debug("HTTP2 Response #{} committed", stream.getId());
}
@Override
public void failed(Throwable x)
{
if (LOG.isDebugEnabled())
LOG.debug("HTTP2 Response #" + stream.getId() + " failed to commit", x);
stream.getSession().disconnect();
}
} }
} }