Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-03-03 04:19:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

437051 Refactor Filter chain handling of Request.isAsyncSupported

Browse Source
This commit is contained in:
Jan Bartel 2014-06-10 16:27:33 +02:00
parent 94164b8fb2
commit fb29f56b4d
1 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
View File

@ -1632,25 +1632,20 @@ public class ServletHandler extends ScopedHandler
{ {
LOG.debug("call filter {}", _filterHolder); LOG.debug("call filter {}", _filterHolder);
Filter filter= _filterHolder.getFilter(); Filter filter= _filterHolder.getFilter();
if (_filterHolder.isAsyncSupported())
filter.doFilter(request, response, _next); //if the request already does not support async, then the setting for the filter
else //is irrelevant. However if the request supports async but this filter does not
{ //temporarily turn it off for the execution of the filter
final boolean suspendable=baseRequest.isAsyncSupported(); boolean requestAsyncSupported = baseRequest.isAsyncSupported();
if (suspendable)
{
try try
{ {
if (!_filterHolder.isAsyncSupported() && requestAsyncSupported)
baseRequest.setAsyncSupported(false); baseRequest.setAsyncSupported(false);
filter.doFilter(request, response, _next); filter.doFilter(request, response, _next);
} }
finally finally
{ {
baseRequest.setAsyncSupported(true); baseRequest.setAsyncSupported(requestAsyncSupported);
}
}
else
filter.doFilter(request, response, _next);
} }
return; return;
} }
@ -1711,23 +1706,20 @@ public class ServletHandler extends ScopedHandler
LOG.debug("call filter " + holder); LOG.debug("call filter " + holder);
Filter filter= holder.getFilter(); Filter filter= holder.getFilter();
if (holder.isAsyncSupported() || !_baseRequest.isAsyncSupported()) //if the request already does not support async, then the setting for the filter
{ //is irrelevant. However if the request supports async but this filter does not
filter.doFilter(request, response, this); //temporarily turn it off for the execution of the filter
} boolean requestAsyncSupported = _baseRequest.isAsyncSupported();
else
{
try try
{ {
if (!holder.isAsyncSupported() && requestAsyncSupported)
_baseRequest.setAsyncSupported(false); _baseRequest.setAsyncSupported(false);
filter.doFilter(request, response, this); filter.doFilter(request, response, this);
} }
finally finally
{ {
_baseRequest.setAsyncSupported(true); _baseRequest.setAsyncSupported(requestAsyncSupported);
} }
}
return; return;
} }