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

Fixes #1671 - Asymmetric usage of trailers in MetaData.Request. 

Reviewed with code cleanups.
This commit is contained in:
Simone Bordet 2017-07-25 12:58:54 +02:00 committed by Joakim Erdfelt
parent f04f486f94
commit be1eb26670
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
View File

@ -61,7 +61,6 @@ import org.eclipse.jetty.util.thread.Scheduler;
* The HttpChannel signals the switch from passive mode to active mode by returning true to one of the
* HttpParser.RequestHandler callbacks. The completion of the active phase is signalled by a call to
* HttpTransport.completed().
*
*/
public class HttpChannel implements Runnable, HttpOutput.Interceptor
{
@ -76,18 +75,11 @@ public class HttpChannel implements Runnable, HttpOutput.Interceptor
private final HttpChannelState _state;
private final Request _request;
private final Response _response;
private final Supplier<HttpFields> _trailerSupplier = new Supplier<HttpFields>()
{
@Override
public HttpFields get()
{
return _trailers;
}
};
private HttpFields _trailers;
private final Supplier<HttpFields> _trailerSupplier = () -> _trailers;
private MetaData.Response _committedMetaData;
private RequestLog _requestLog;
private long _oldIdleTimeout;
private HttpFields _trailers;
/** Bytes written after interception (eg after compression) */
private long _written;
@ -262,6 +254,8 @@ public class HttpChannel implements Runnable, HttpOutput.Interceptor
_committedMetaData=null;
_requestLog=_connector==null?null:_connector.getServer().getRequestLog();
_written=0;
_trailers=null;
_oldIdleTimeout=0;
}
public void asyncReadFillInterested()

2
jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
View File

@ -219,7 +219,7 @@ public class Request implements HttpServletRequest
public HttpFields getTrailers()
{
MetaData.Request metadata=_metaData;
Supplier<HttpFields> trailers = metadata==null?null:metadata.getTrailerSupplier();
Supplier<HttpFields> trailers = metadata==null?null:metadata.getTrailerSupplier();
return trailers==null?null:trailers.get();
}