markt 2004/03/20 01:44:00
Modified: jasper2/src/share/org/apache/jasper/runtime Tag:
tomcat_4_branch JspWriterImpl.java
Log:
- Fix bug 13499 (again). If page output is unbuffered, illegal state exception is no
longer
thrown on forward if and only if nothing has been written to the page. The ise will
still be
thrown on forward if there has been any unbuffered output (JSP.5.5)
- Ported from TC5
Revision Changes Path
No revision
No revision
1.3.2.4 +5 -4
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspWriterImpl.java
Index: JspWriterImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspWriterImpl.java,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -u -r1.3.2.3 -r1.3.2.4
--- JspWriterImpl.java 19 Mar 2004 17:34:32 -0000 1.3.2.3
+++ JspWriterImpl.java 20 Mar 2004 09:44:00 -0000 1.3.2.4
@@ -180,7 +180,8 @@
* Discard the output buffer.
*/
public final void clear() throws IOException {
- if (bufferSize == 0)
+ if ((bufferSize == 0) && (out != null))
+ // clear() is illegal after any unbuffered output (JSP.5.5)
throw new
IllegalStateException(Constants.getString("jsp.error.ise_on_clear"));
if (flushed)
throw new
IOException(Constants.getString("jsp.error.attempt_to_clear_flushed_buffer"));
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
