tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1428643 - in /tomcat/trunk/java/org/apache/catalina/core: ApplicationFilterConfig.java LocalStrings.properties
Date Thu, 03 Jan 2013 22:24:27 GMT
Author: markt
Date: Thu Jan  3 22:24:27 2013
New Revision: 1428643

URL: http://svn.apache.org/viewvc?rev=1428643&view=rev
Log:
Stop broken filters breaking things on application stop.

Modified:
    tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
    tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java?rev=1428643&r1=1428642&r2=1428643&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java Thu Jan  3 22:24:27
2013
@@ -309,7 +309,15 @@ public final class ApplicationFilterConf
                 }
                 SecurityUtil.remove(filter);
             } else {
-                filter.destroy();
+                try {
+                    filter.destroy();
+                } catch (Throwable t) {
+                    ExceptionUtils.handleThrowable(t);
+                    context.getLogger().error(sm.getString(
+                            "applicationFilterConfig.release",
+                            filterDef.getFilterName(),
+                            filterDef.getFilterClass()), t);
+                }
             }
             if (!context.getIgnoreAnnotations()) {
                 try {

Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1428643&r1=1428642&r2=1428643&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties Thu Jan  3 22:24:27
2013
@@ -41,6 +41,7 @@ applicationDispatcher.specViolation.resp
 applicationFilterConfig.jmxRegisterFail=JMX registration failed for filter of type [{0}]
and name [{1}]
 applicationFilterConfig.jmxUnregister=JMX de-registration complete for filter of type [{0}]
and name [{1}]
 applicationFilterConfig.jmxUnregisterFail=JMX de-registration failed for filter of type [{0}]
and name [{1}]
+applicationFilterConfig.release=Failed to destroy the filter named [{0}] of type [{1}]
 applicationFilterRegistration.nullInitParam=Unable to set initialisation parameter for filter
due to null name and/or value. Name [{0}], Value [{1}]
 applicationFilterRegistration.nullInitParams=Unable to set initialisation parameters for
filter due to null name and/or value. Name [{0}], Value [{1}]
 applicationServletRegistration.setServletSecurity.iae=Null constraint specified for servlet
[{0}] deployed to context with name [{1}]



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


Mime
View raw message