amyroh 2003/02/12 03:04:59
Modified: catalina/src/share/org/apache/catalina/core
StandardWrapperValve.java
Log:
Fix to return 404 for permanent UnavailableException and 503 for temporary
UnavailableException according to Servlet spec 2.4. It was still returning 503
for permanent UnavailableException for the first request to the page before this
fix.
Revision Changes Path
1.12 +11 -6
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardWrapperValve.java
Index: StandardWrapperValve.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardWrapperValve.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- StandardWrapperValve.java 30 Jan 2003 18:22:47 -0000 1.11
+++ StandardWrapperValve.java 12 Feb 2003 11:04:59 -0000 1.12
@@ -308,11 +308,16 @@
// exception(request, response, e);
wrapper.unavailable(e);
long available = wrapper.getAvailable();
- if ((available > 0L) && (available < Long.MAX_VALUE))
+ if ((available > 0L) && (available < Long.MAX_VALUE)) {
hres.setDateHeader("Retry-After", available);
- hres.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE,
+ hres.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE,
sm.getString("standardWrapper.isUnavailable",
wrapper.getName()));
+ } else if (available == Long.MAX_VALUE) {
+ hres.sendError(HttpServletResponse.SC_NOT_FOUND,
+ sm.getString("standardWrapper.notFound",
+ wrapper.getName()));
+ }
// Do not save exception in 'throwable', because we
// do not want to do exception(request, response, e) processing
} catch (ServletException e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
