remm 02/02/21 14:13:33
Modified: catalina/src/share/org/apache/catalina/connector Tag:
tomcat_40_branch ResponseBase.java
Log:
- Port fixes for 6201.
- Tweak the code so that in the case of an unsupported encoding exception,
the stream isn't initialized.
Revision Changes Path
No revision
No revision
1.16.2.6 +9 -8
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/ResponseBase.java
Index: ResponseBase.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/ResponseBase.java,v
retrieving revision 1.16.2.5
retrieving revision 1.16.2.6
diff -u -r1.16.2.5 -r1.16.2.6
--- ResponseBase.java 21 Feb 2002 06:09:51 -0000 1.16.2.5
+++ ResponseBase.java 21 Feb 2002 22:13:33 -0000 1.16.2.6
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/ResponseBase.java,v
1.16.2.5 2002/02/21 06:09:51 remm Exp $
- * $Revision: 1.16.2.5 $
- * $Date: 2002/02/21 06:09:51 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/ResponseBase.java,v
1.16.2.6 2002/02/21 22:13:33 remm Exp $
+ * $Revision: 1.16.2.6 $
+ * $Date: 2002/02/21 22:13:33 $
*
* ====================================================================
*
@@ -89,7 +89,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.16.2.5 $ $Date: 2002/02/21 06:09:51 $
+ * @version $Revision: 1.16.2.6 $ $Date: 2002/02/21 22:13:33 $
*/
public abstract class ResponseBase
@@ -750,11 +750,12 @@
throw new IllegalStateException
(sm.getString("responseBase.getWriter.ise"));
- stream = createOutputStream();
- ((ResponseStream) stream).setCommit(false);
+ ResponseStream newStream = (ResponseStream) createOutputStream();
+ newStream.setCommit(false);
OutputStreamWriter osr =
- new OutputStreamWriter(stream, getCharacterEncoding());
- writer = new ResponseWriter(osr, (ResponseStream) stream);
+ new OutputStreamWriter(newStream, getCharacterEncoding());
+ writer = new ResponseWriter(osr, newStream);
+ stream = newStream;
return (writer);
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
