You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by cr...@locus.apache.org on 2000/08/19 22:00:43 UTC
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector HttpResponseBase.java
craigmcc 00/08/19 13:00:42
Modified: catalina/src/share/org/apache/catalina/connector
HttpResponseBase.java
Log:
Clean up the data buffer reset when calling sendRedirect() or
sendError().
Revision Changes Path
1.3 +12 -11 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java
Index: HttpResponseBase.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HttpResponseBase.java 2000/08/19 05:29:15 1.2
+++ HttpResponseBase.java 2000/08/19 20:00:41 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java,v 1.2 2000/08/19 05:29:15 remm Exp $
- * $Revision: 1.2 $
- * $Date: 2000/08/19 05:29:15 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java,v 1.3 2000/08/19 20:00:41 craigmcc Exp $
+ * $Revision: 1.3 $
+ * $Date: 2000/08/19 20:00:41 $
*
* ====================================================================
*
@@ -95,7 +95,7 @@
* methods need to be implemented.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.2 $ $Date: 2000/08/19 05:29:15 $
+ * @version $Revision: 1.3 $ $Date: 2000/08/19 20:00:41 $
*/
public class HttpResponseBase
@@ -880,12 +880,10 @@
this.status = status;
this.message = message;
- // Cause the response to be committed but generate no output
- try {
- resetBuffer();
- } catch (Throwable t) {
- ;
- }
+ // Clear any data content that has been buffered
+ resetBuffer();
+
+ // Cause the response to be committed
String contentType = getContentType();
if ((contentType == null) || "text/plain".equals(contentType))
setContentType("text/html");
@@ -915,8 +913,11 @@
if (included)
return; // Ignore any call from an included servlet
+
+ // Clear any data content that has been buffered
+ resetBuffer();
- reset();
+ // Generate a temporary redirect to the specified location
String absolute = toAbsolute(location);
setStatus(SC_MOVED_TEMPORARILY, absolute);
setHeader("Location", absolute);