Author: markt
Date: Fri Jul 1 16:20:34 2016
New Revision: 1750975
URL: http://svn.apache.org/viewvc?rev=1750975&view=rev
Log:
Catch and log any Exceptions during calls to Servlet.destroy() when destroying
the Servlet associated with a JSP page.
Modified:
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=1750975&r1=1750974&r2=1750975&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties Fri
Jul 1 16:20:34 2016
@@ -373,6 +373,7 @@ jsp.error.tag.conflict.trimdirectivewhit
# JSP Servlet
jsp.error.servlet.invalid.method=JSPs only permit GET POST or HEAD
+jsp.error.servlet.destroy.failed=Exception during Servlet.destroy() for JSP
page
# JarScanner
jsp.warning.noJarScanner=Warning: No org.apache.tomcat.JarScanner set in
ServletContext. Falling back to default JarScanner implementation.
Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java?rev=1750975&r1=1750974&r2=1750975&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java Fri Jul
1 16:20:34 2016
@@ -486,7 +486,12 @@ public class JspServletWrapper {
public void destroy() {
if (theServlet != null) {
- theServlet.destroy();
+ try {
+ theServlet.destroy();
+ } catch (Throwable t) {
+ ExceptionUtils.handleThrowable(t);
+
log.error(Localizer.getMessage("jsp.error.servlet.destroy.failed"), t);
+ }
InstanceManager instanceManager =
InstanceManagerFactory.getInstanceManager(config);
try {
instanceManager.destroyInstance(theServlet);
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1750975&r1=1750974&r2=1750975&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Jul 1 16:20:34 2016
@@ -112,6 +112,15 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Jasper">
+ <changelog>
+ <fix>
+ Catch and log any <code>Exception</code>s during calls to
+ <code>Servlet.destroy()</code> when destroying the Servlet associated
+ with a JSP page. (markt)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="WebSocket">
<changelog>
<scode>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
