cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler JspParseEventListener.java

[pierred]

pierred     00/11/26 08:17:35

  Modified:    jasper/src/share/org/apache/jasper/compiler
                        JspParseEventListener.java
  Log:
  As per JSP1.2, generated servlet now catches Throwable instead
  of Exception, and calls PageContext.handlePageException(Throwable).
  Submitted by: "Rob Saccoccio" <[EMAIL PROTECTED]>
  
  Revision  Changes    Path
  1.12      +5 -6      
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java
  
  Index: JspParseEventListener.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- JspParseEventListener.java        2000/11/06 20:52:26     1.11
  +++ JspParseEventListener.java        2000/11/26 16:17:34     1.12
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
 1.11 2000/11/06 20:52:26 pierred Exp $
  - * $Revision: 1.11 $
  - * $Date: 2000/11/06 20:52:26 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
 1.12 2000/11/26 16:17:34 pierred Exp $
  + * $Revision: 1.12 $
  + * $Date: 2000/11/26 16:17:34 $
    *
    * ====================================================================
    *
  @@ -356,14 +356,13 @@
   
       private void generateFooter() throws JasperException {
        writer.popIndent();
  -     //writer.println("} catch (Throwable t) {");
  -     writer.println("} catch (Exception ex) {");
  +     writer.println("} catch (Throwable t) {");
        writer.pushIndent();
           writer.println("if (out.getBufferSize() != 0)");
           writer.pushIndent();
        writer.println("out.clearBuffer();");
        writer.popIndent();
  -     writer.println("pageContext.handlePageException(ex);");
  +     writer.println("pageContext.handlePageException(t);");
        writer.popIndent();
        writer.println("} finally {");
        writer.pushIndent();