remm 02/02/21 14:15:56
Modified: catalina/src/share/org/apache/catalina/connector Tag:
tomcat_40_branch HttpResponseBase.java
Log:
- Port fix for 6201.
- If the encoding is invalid, response output wouldn't work.
Revision Changes Path
No revision
No revision
1.37.2.7 +10 -6
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.37.2.6
retrieving revision 1.37.2.7
diff -u -r1.37.2.6 -r1.37.2.7
--- HttpResponseBase.java 30 Jan 2002 03:48:54 -0000 1.37.2.6
+++ HttpResponseBase.java 21 Feb 2002 22:15:56 -0000 1.37.2.7
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java,v
1.37.2.6 2002/01/30 03:48:54 billbarker Exp $
- * $Revision: 1.37.2.6 $
- * $Date: 2002/01/30 03:48:54 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java,v
1.37.2.7 2002/02/21 22:15:56 remm Exp $
+ * $Revision: 1.37.2.7 $
+ * $Date: 2002/02/21 22:15:56 $
*
* ====================================================================
*
@@ -101,7 +101,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.37.2.6 $ $Date: 2002/01/30 03:48:54 $
+ * @version $Revision: 1.37.2.7 $ $Date: 2002/02/21 22:15:56 $
*/
public class HttpResponseBase
@@ -574,8 +574,12 @@
}
// Prepare a suitable output writer
- OutputStreamWriter osr =
- new OutputStreamWriter(getStream(), getCharacterEncoding());
+ OutputStreamWriter osr = null;
+ try {
+ osr = new OutputStreamWriter(getStream(), getCharacterEncoding());
+ } catch (UnsupportedEncodingException e) {
+ osr = new OutputStreamWriter(getStream());
+ }
final PrintWriter outputWriter = new PrintWriter(osr);
// Send the "Status:" header
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
