Author: markt
Date: Mon Apr 18 19:58:18 2016
New Revision: 1739814
URL: http://svn.apache.org/viewvc?rev=1739814&view=rev
Log:
Partial fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=59219
If an exception is throw in the service() method after startAsync() is called,
trigger the Async error handling process
Modified:
tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java
Modified: tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java?rev=1739814&r1=1739813&r2=1739814&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java Mon Apr
18 19:58:18 2016
@@ -98,9 +98,13 @@ public class ErrorReportValve extends Va
Throwable throwable = (Throwable)
request.getAttribute(RequestDispatcher.ERROR_EXCEPTION);
// If an async request is in progress and is not going to end once this
- // container thread finishes, do not trigger error page handling - it
- // will be triggered later if required.
+ // container thread finishes, do not process the error page here but
+ // trigger an error dispatch so the additional async processing such as
+ // firing onError() occurs.
if (request.isAsync() && !request.isAsyncCompleting()) {
+ if (throwable != null) {
+ request.getAsyncContextInternal().setErrorState(throwable,
true);
+ }
return;
}
Modified: tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java?rev=1739814&r1=1739813&r2=1739814&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java [UTF-8]
(original)
+++ tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java [UTF-8] Mon Apr
18 19:58:18 2016
@@ -52,24 +52,27 @@ import org.apache.tomcat.util.security.P
* DISPATCHING - The dispatch is being processed.
* ERROR - Something went wrong.
*
- * |-----------------»--------------|
- * | \|/
- * |
|----------«---------------ERROR---------------------------«-------------------------------|
- * | | complete() \
|
- * | | \---------------|
|
- * | | |dispatch()
|
- * | | \|/
|
- * | | |
|
- * | | |--|timeout() |
|
- * | | post() | \|/ | post()
|
- * | | |---------------»DISPATCHED«---------- |
--------------COMPLETING«-----| |
- * | | | /|\ | | |
/|\ | |
- * | | | |---»-------| | | |--|
| |
- * | | ^ | |startAsync() |
timeout() | |
- * | | | | | |
| |
- * | \|/ | | complete() \|/ post() |
| |
+ * |-----------------»--------|
+ * | \|/
+ * |
|----------«---------ERROR---------------------------------«-------------------------------|
+ * | | complete() /|\ \
|
+ * | | | \---------------------|
|
+ * | | | |dispatch()
|
+ * | | | \|/
|
+ * | | | |
|
+ * | | | |--|timeout() |
|
+ * | | post() | | \|/ | post()
|
+ * | | |---------- | --»DISPATCHED«---------- |
--------------COMPLETING«-----| |
+ * | | | | /|\ | | |
/|\ | |
+ * | | | |---»- | ---| | | |--|
| |
+ * | | ^ | | |startAsync() |
timeout() | |
+ * | | | | \ | |
| |
+ * | | | | \ | |
| |
+ * | | | | \ | |
| |
+ * | | | | \ | |
| |
+ * | \|/ | | \ \|/ post() |
| |
* | MUST_COMPLETE-«- | ----«------STARTING--»--------- | -------------|
^ |
- * | /|\ /|\ | | | |
complete() | |
+ * | /|\ /|\ | complete() | | |
complete() | |
* | | | | | | post() |
/----------| |
* | | | ^ |dispatch() | |-----| | /
|
* | | | | | | | | | /
|
@@ -357,7 +360,8 @@ public class AsyncStateMachine {
public synchronized void asyncError() {
- if (state == AsyncState.DISPATCHED ||
+ if (state == AsyncState.STARTING ||
+ state == AsyncState.DISPATCHED ||
state == AsyncState.TIMING_OUT ||
state == AsyncState.READ_WRITE_OP) {
clearNonBlockingListeners();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
