tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kkoli...@apache.org
Subject svn commit: r1347100 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/jasper/compiler/Generator.java webapps/docs/changelog.xml
Date Wed, 06 Jun 2012 20:23:20 GMT
Author: kkolinko
Date: Wed Jun  6 20:23:19 2012
New Revision: 1347100

URL: http://svn.apache.org/viewvc?rev=1347100&view=rev
Log:
Merged revision 1346885 from tomcat/trunk:
https://issues.apache.org/bugzilla/show_bug.cgi?id=48097#c7
https://issues.apache.org/bugzilla/show_bug.cgi?id=53366#c1
If _jspService() in generated JSP page code unexpectedly cannot properly handle an exception
because _jspx_page_context initialization did not happen, log it instead of silent swallowing.

Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
    tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1346885

Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Generator.java?rev=1347100&r1=1347099&r2=1347100&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Generator.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Generator.java Wed Jun  6 20:23:19
2012
@@ -3395,6 +3395,7 @@ class Generator {
         out.printil("try { out.clearBuffer(); } catch (java.io.IOException e) {}");
         out.popIndent();
         out.printil("if (_jspx_page_context != null) _jspx_page_context.handlePageException(t);");
+        out.printil("else log(t.getMessage(), t);");
         out.popIndent();
         out.printil("}");
         out.popIndent();

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1347100&r1=1347099&r2=1347100&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Jun  6 20:23:19 2012
@@ -288,6 +288,11 @@
   <subsection name="Jasper">
     <changelog>
       <fix>
+        <bug>48097#c7</bug>, <bug>53366#c1</bug>: If JSP page unexpectedly
+        fails to initialize PageContext instance, write exception to the logs
+        instead of silent swallowing. (kkolinko)
+      </fix>
+      <fix>
         <bug>53032</bug>: Modify <code>JspC</code> so it extends
         <code>org.apache.tools.ant.Task</code> enabling it to work with features
         such as namespaces within build.xml files. (markt)



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message