Author: markt Date: Wed Dec 18 15:51:32 2013 New Revision: 1551986 URL: http://svn.apache.org/r1551986 Log: Clean-up. No functional change.
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=1551986&r1=1551985&r2=1551986&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original) +++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Wed Dec 18 15:51:32 2013 @@ -35,6 +35,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.Stack; import java.util.TreeMap; @@ -4629,34 +4630,33 @@ public class StandardContext extends Con */ public boolean filterStart() { - if (getLogger().isDebugEnabled()) + if (getLogger().isDebugEnabled()) { getLogger().debug("Starting filters"); + } // Instantiate and record a FilterConfig for each defined filter boolean ok = true; synchronized (filterConfigs) { filterConfigs.clear(); - Iterator<String> names = filterDefs.keySet().iterator(); - while (names.hasNext()) { - String name = names.next(); - if (getLogger().isDebugEnabled()) + for (Entry<String,FilterDef> entry : filterDefs.entrySet()) { + String name = entry.getKey(); + if (getLogger().isDebugEnabled()) { getLogger().debug(" Starting filter '" + name + "'"); - ApplicationFilterConfig filterConfig = null; + } try { - filterConfig = - new ApplicationFilterConfig(this, filterDefs.get(name)); + 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); + getLogger().error(sm.getString( + "standardContext.filterStart", name), t); ok = false; } } } - return (ok); - + return ok; } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org