You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2001/10/06 00:01:44 UTC
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core StandardContextValve.java
remm 01/10/05 15:01:44
Modified: catalina/src/share/org/apache/catalina/core Tag:
tomcat_40_branch StandardContextValve.java
Log:
- Forgot to remove a finishResponse.
- Use sendError instead of setStatus (which was probably a hack to avoid committing
the response).
- Thanks to Patrick Luby for showing me the bug.
Revision Changes Path
No revision
No revision
1.12.2.2 +10 -11 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContextValve.java
Index: StandardContextValve.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContextValve.java,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -u -r1.12.2.1 -r1.12.2.2
--- StandardContextValve.java 2001/10/04 19:27:58 1.12.2.1
+++ StandardContextValve.java 2001/10/05 22:01:44 1.12.2.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContextValve.java,v 1.12.2.1 2001/10/04 19:27:58 remm Exp $
- * $Revision: 1.12.2.1 $
- * $Date: 2001/10/04 19:27:58 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContextValve.java,v 1.12.2.2 2001/10/05 22:01:44 remm Exp $
+ * $Revision: 1.12.2.2 $
+ * $Date: 2001/10/05 22:01:44 $
*
* ====================================================================
*
@@ -93,7 +93,7 @@
* when processing HTTP requests.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.12.2.1 $ $Date: 2001/10/04 19:27:58 $
+ * @version $Revision: 1.12.2.2 $ $Date: 2001/10/05 22:01:44 $
*/
final class StandardContextValve
@@ -166,11 +166,6 @@
relativeURI.startsWith("/META-INF/") ||
relativeURI.startsWith("/WEB-INF/")) {
notFound(requestURI, (HttpServletResponse) response.getResponse());
- try {
- response.finishResponse();
- } catch (IOException e) {
- ;
- }
return;
}
@@ -223,9 +218,11 @@
private void badRequest(String requestURI, HttpServletResponse response) {
try {
- response.setStatus(HttpServletResponse.SC_BAD_REQUEST, requestURI);
+ response.sendError(HttpServletResponse.SC_BAD_REQUEST, requestURI);
} catch (IllegalStateException e) {
;
+ } catch (IOException e) {
+ ;
}
}
@@ -242,8 +239,10 @@
private void notFound(String requestURI, HttpServletResponse response) {
try {
- response.setStatus(HttpServletResponse.SC_NOT_FOUND, requestURI);
+ response.sendError(HttpServletResponse.SC_NOT_FOUND, requestURI);
} catch (IllegalStateException e) {
+ ;
+ } catch (IOException e) {
;
}