[jbossweb-commits] JBossWeb SVN: r1880 - trunk/java/org/apache/catalina/core.
Author: remy.maucherat(a)jboss.com
Date: 2011-12-01 06:47:33 -0500 (Thu, 01 Dec 2011)
New Revision: 1880
Modified:
trunk/java/org/apache/catalina/core/StandardHostValve.java
Log:
AS7-2844: The check was probably correct, but not in the right location.
Modified: trunk/java/org/apache/catalina/core/StandardHostValve.java
===================================================================
--- trunk/java/org/apache/catalina/core/StandardHostValve.java 2011-11-30 13:54:33 UTC
(rev 1879)
+++ trunk/java/org/apache/catalina/core/StandardHostValve.java 2011-12-01 11:47:33 UTC
(rev 1880)
@@ -284,11 +284,11 @@
} else {
status(request, response);
}
+ // An error page (if any) must call complete or dispatch, if not the
container calls complete
+ if (request.isEventMode() && asyncContext.getPath() == null) {
+ asyncContext.complete();
+ }
}
- // AS7-2844 if (request.isEventMode() && asyncContext.getPath() ==
null) {
- if (!asyncContext.isReady()) {
- asyncContext.complete();
- }
}
// Exit application scope