Author: markt
Date: Wed Dec 18 17:09:08 2013
New Revision: 1552029
URL: http://svn.apache.org/r1552029
Log:
Revert r1551991 - The solution I had in mind isn't spec compliant
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1552029&r1=1552028&r2=1552029&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Wed Dec 18
17:09:08 2013
@@ -4638,7 +4638,19 @@ public class StandardContext extends Con
synchronized (filterConfigs) {
filterConfigs.clear();
for (Entry<String,FilterDef> entry : filterDefs.entrySet()) {
- if (!filterStart(entry.getKey(), entry.getValue())) {
+ String name = entry.getKey();
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug(" Starting filter '" + name + "'");
+ }
+ try {
+ ApplicationFilterConfig filterConfig =
+ new ApplicationFilterConfig(this,
entry.getValue());
+ filterConfigs.put(name, filterConfig);
+ } catch (Throwable t) {
+ t = ExceptionUtils.unwrapInvocationTargetException(t);
+ ExceptionUtils.handleThrowable(t);
+ getLogger().error(sm.getString(
+ "standardContext.filterStart", name), t);
ok = false;
}
}
@@ -4648,25 +4660,6 @@ public class StandardContext extends Con
}
- private boolean filterStart(String name, FilterDef filterDef) {
- if (getLogger().isDebugEnabled()) {
- getLogger().debug(" Starting filter '" + name + "'");
- }
- try {
- ApplicationFilterConfig filterConfig =
- new ApplicationFilterConfig(this, filterDef);
- filterConfigs.put(name, filterConfig);
- } catch (Throwable t) {
- t = ExceptionUtils.unwrapInvocationTargetException(t);
- ExceptionUtils.handleThrowable(t);
- getLogger().error(sm.getString(
- "standardContext.filterStart", name), t);
- return false;
- }
- return true;
- }
-
-
/**
* Finalize and release the set of filters for this Context.
* Return <code>true</code> if all filter finalization completed
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
