Author: kkolinko
Date: Sun Jun 17 15:06:33 2012
New Revision: 1351111

URL: http://svn.apache.org/viewvc?rev=1351111&view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=48097#c7
https://issues.apache.org/bugzilla/show_bug.cgi?id=53366#c1
If JSP page unexpectedly fails to initialize PageContext instance,
write exception to the logs instead of silent swallowing.
Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1351111&r1=1351110&r2=1351111&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Jun 17 15:06:33 2012
@@ -196,16 +196,6 @@ PATCHES PROPOSED TO BACKPORT:
   +1: schultz, kkolinko
   -1:
 
-* https://issues.apache.org/bugzilla/show_bug.cgi?id=48097#c7
-  https://issues.apache.org/bugzilla/show_bug.cgi?id=53366#c1
-  If JSP page unexpectedly fails to initialize PageContext instance,
-  write exception to the logs instead of silent swallowing.
-  Patch:
-  http://people.apache.org/~kkolinko/patches/2012-06-06_tc6_Generator.patch
-  (backport of r1347100 in Tomcat 7, r1346885 in trunk)
-  +1: kkolinko, schultz, fhanik
-  -1:
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52996
   In StandardThreadExecutor:
   Add the ability to configure a job queue size.

Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java?rev=1351111&r1=1351110&r2=1351111&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java Sun Jun 
17 15:06:33 2012
@@ -3366,6 +3366,8 @@ class Generator {
 
         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/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1351111&r1=1351110&r2=1351111&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun Jun 17 15:06:33 2012
@@ -141,8 +141,9 @@
         or later. (rjung)
       </update>
       <fix>
-        <bug>52055#c14</bug>: Correctly reset ChunkedInputFilter.needCRLFParse
-        flag when the filter is recycled. (kkolinko)
+        <bug>52055</bug> (comment 14): Correctly reset
+        <code>ChunkedInputFilter.needCRLFParse</code> flag when the filter
+        is recycled. (kkolinko)
       </fix>
       <fix>
         <bug>52606</bug>: Ensure replayed POST bodies are available when using
@@ -153,6 +154,11 @@
   <subsection name="Jasper">
     <changelog>
       <fix>
+        <bug>48097</bug> (comment 7), <bug>53366</bug> (comment 1):
+        If JSP page unexpectedly fails to initialize PageContext instance,
+        write exception to the logs instead of silent swallowing. (kkolinko)
+      </fix>
+      <fix>
         <bug>52335</bug>: Only handle <code>&lt;\%</code> and not
         <code>\%</code> as escaped in template text. (markt)
       </fix>



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

Reply via email to