remm 02/02/20 11:24:38
Modified: catalina/src/share/org/apache/catalina/connector/http
HttpResponseStream.java
Log:
- Fix a NPE which could happen with an invalid request.
Revision Changes Path
1.12 +7 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseStream.java
Index: HttpResponseStream.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseStream.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- HttpResponseStream.java 27 Nov 2001 16:22:47 -0000 1.11
+++ HttpResponseStream.java 20 Feb 2002 19:24:38 -0000 1.12
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseStream.java,v
1.11 2001/11/27 16:22:47 remm Exp $
- * $Revision: 1.11 $
- * $Date: 2001/11/27 16:22:47 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseStream.java,v
1.12 2002/02/20 19:24:38 remm Exp $
+ * $Revision: 1.12 $
+ * $Date: 2002/02/20 19:24:38 $
*
* ====================================================================
*
@@ -250,10 +250,12 @@
protected void checkHead(HttpResponseImpl response) {
HttpServletRequest servletRequest =
(HttpServletRequest) response.getRequest();
- if (servletRequest.getMethod().equals("HEAD"))
+ if ((servletRequest.getMethod() != null)
+ && (servletRequest.getMethod().equals("HEAD"))) {
writeContent = false;
- else
+ } else {
writeContent = true;
+ }
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
