Author: remy.maucherat(a)jboss.com Date: 2010-06-28 05:12:39 -0400 (Mon, 28 Jun 2010) New Revision: 1494 Modified: trunk/java/org/apache/catalina/core/StandardWrapperValve.java Log: - If timeout does nothing, set a 500 status. (read on the Tomcat list) Modified: trunk/java/org/apache/catalina/core/StandardWrapperValve.java =================================================================== --- trunk/java/org/apache/catalina/core/StandardWrapperValve.java 2010-06-24 10:20:27 UTC (rev 1493) +++ trunk/java/org/apache/catalina/core/StandardWrapperValve.java 2010-06-28 09:12:39 UTC (rev 1494) @@ -598,6 +598,9 @@ exception(request, response, e); } } + if (timeout && request.isEventMode() && asyncContext.getPath() == null) { + response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); + } } else if (asyncContext.getRunnable() != null) { // Execute the runnable try {