Author: markt Date: Wed Apr 18 19:28:08 2007 New Revision: 530239 URL: http://svn.apache.org/viewvc?view=rev&rev=530239 Log: Fix bug 42071 - ISE on multiple UnavailableExceptions. Allow recovery after an UnavailableException
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java?view=diff&rev=530239&r1=530238&r2=530239 ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java Wed Apr 18 19:28:08 2007 @@ -294,10 +294,16 @@ } if ((available > 0L) && (available < Long.MAX_VALUE)) { - response.setDateHeader("Retry-After", available); - response.sendError - (HttpServletResponse.SC_SERVICE_UNAVAILABLE, - Localizer.getMessage("jsp.error.unavailable")); + if (available > System.currentTimeMillis()) { + response.setDateHeader("Retry-After", available); + response.sendError + (HttpServletResponse.SC_SERVICE_UNAVAILABLE, + Localizer.getMessage("jsp.error.unavailable")); + return; + } else { + // Wait period has expired. Reset. + available = 0; + } } /* Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?view=diff&rev=530239&r1=530238&r2=530239 ============================================================================== --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Apr 18 19:28:08 2007 @@ -50,6 +50,14 @@ TagData.REQUEST_TIME_VALUE when the attribute value is an EL expression. (markt) </fix> + <fix> + <bug>42071</bug> Fix IllegalStateException on multiple requests to + an unavailable JSP. Patch provided by Kawasima Kazuh. (markt) + </fix> + <fix> + After a JSP throws an UnavailableException allow it to be accessed once + the unavailable period has expired. (markt) + </fix> </changelog> </subsection> </section> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]