You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2002/06/09 08:17:31 UTC
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler Generator.java
remm 2002/06/08 23:17:31
Modified: jasper2/src/share/org/apache/jasper/compiler Generator.java
Log:
- Add back the code to reset the buffer when an unexpected exception
occurs. This code was commented out in version 1.16.
- Otherwise, the response is always committed and this breaks error
pages and error reports.
Revision Changes Path
1.19 +5 -5 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java
Index: Generator.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Generator.java 8 Jun 2002 00:14:35 -0000 1.18
+++ Generator.java 9 Jun 2002 06:17:31 -0000 1.19
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v 1.18 2002/06/08 00:14:35 kinman Exp $
- * $Revision: 1.18 $
- * $Date: 2002/06/08 00:14:35 $
+ * $Header: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v 1.19 2002/06/09 06:17:31 remm Exp $
+ * $Revision: 1.19 $
+ * $Date: 2002/06/09 06:17:31 $
*
* ====================================================================
*
@@ -1548,12 +1548,12 @@
out.popIndent();
out.printil("} catch (Throwable t) {");
out.pushIndent();
-/*
+
out.printil("if (out != null && out.getBufferSize() != 0)");
out.pushIndent();
out.printil("out.clearBuffer();");
out.popIndent();
-*/
+
out.printil("if (pageContext != null) pageContext.handlePageException(t);");
out.popIndent();
out.printil("} finally {");
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>