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

481554 DispatcherType reset race 

Cherry pick of fa53b11850

Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
This commit is contained in:
Greg Wilkins 2015-10-30 10:35:37 +11:00
parent c8ec399af2
commit 56afc2b0e5
1 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -295,7 +295,6 @@ public class HttpChannel implements Runnable, HttpOutput.Interceptor
throw new IllegalStateException("state=" + _state);
_request.setHandled(false);
_response.getHttpOutput().reopen();
_request.setDispatcherType(DispatcherType.REQUEST);
List<HttpConfiguration.Customizer> customizers = _configuration.getCustomizers();
if (!customizers.isEmpty())
@ -303,7 +302,15 @@ public class HttpChannel implements Runnable, HttpOutput.Interceptor
for (HttpConfiguration.Customizer customizer : customizers)
customizer.customize(getConnector(), _configuration, _request);
}
getServer().handle(this);
try
{
_request.setDispatcherType(DispatcherType.REQUEST);
getServer().handle(this);
}
finally
{
_request.setDispatcherType(null);
}
break;
}
@ -311,8 +318,16 @@ public class HttpChannel implements Runnable, HttpOutput.Interceptor
{
_request.setHandled(false);
_response.getHttpOutput().reopen();
_request.setDispatcherType(DispatcherType.ASYNC);
getServer().handleAsync(this);
try
{
_request.setDispatcherType(DispatcherType.ASYNC);
getServer().handleAsync(this);
}
finally
{
_request.setDispatcherType(null);
}
break;
}
@ -344,7 +359,7 @@ public class HttpChannel implements Runnable, HttpOutput.Interceptor
_request.setHandled(false);
_response.resetBuffer();
_response.getHttpOutput().reopen();
_request.setDispatcherType(DispatcherType.ERROR);
String reason;
if (ex == null || ex instanceof TimeoutException)
@ -371,7 +386,16 @@ public class HttpChannel implements Runnable, HttpOutput.Interceptor
_state.getAsyncContextEvent().setDispatchPath(error_page);
}
getServer().handleAsync(this);
try
{
_request.setDispatcherType(DispatcherType.ERROR);
getServer().handleAsync(this);
}
finally
{
_request.setDispatcherType(null);
}
break;
}
@ -447,10 +471,6 @@ public class HttpChannel implements Runnable, HttpOutput.Interceptor
handleException(e);
}
}
finally
{
_request.setDispatcherType(null);
}
action = _state.unhandle();
}