tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1530975 - in /tomcat/trunk: java/org/apache/jasper/JspC.java webapps/docs/changelog.xml
Date Thu, 10 Oct 2013 13:38:21 GMT
Author: markt
Date: Thu Oct 10 13:38:20 2013
New Revision: 1530975

URL: http://svn.apache.org/r1530975
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55251
Do not allow JspC task to fail silently if the web.xml or web.xml fragment can not be generated.


Modified:
    tomcat/trunk/java/org/apache/jasper/JspC.java
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/jasper/JspC.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspC.java?rev=1530975&r1=1530974&r2=1530975&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspC.java Thu Oct 10 13:38:20 2013
@@ -1374,7 +1374,7 @@ public class JspC extends Task implement
         }
     }
 
-    protected void initWebXml() {
+    protected void initWebXml() throws JasperException {
         try {
             if (webxmlLevel >= INC_WEBXML) {
                 mapout = openWebxmlWriter(new File(webxmlFile));
@@ -1396,6 +1396,7 @@ public class JspC extends Task implement
             mapout = null;
             servletout = null;
             mappingout = null;
+            throw new JasperException(ioe);
         }
     }
 

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1530975&r1=1530974&r2=1530975&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Oct 10 13:38:20 2013
@@ -230,6 +230,10 @@
         Servlet container itself. The scan is now performed only once rather than
         in two passes reducing startup time. (jboynes)
       </scode>
+      <fix>
+        <bug>55251</bug>: Do not allow JspC task to fail silently if the web.xml
+        or web.xml fragment can not be generated. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Cluster">



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


Mime
View raw message