Author: remy.maucherat(a)jboss.com Date: 2009-12-11 11:41:24 -0500 (Fri, 11 Dec 2009) New Revision: 1332 Modified: trunk/java/org/apache/catalina/core/StandardWrapper.java trunk/java/org/apache/catalina/deploy/FilterDef.java Log: - Ignore second occurence when the name occurs more than once in the same descriptor. Modified: trunk/java/org/apache/catalina/core/StandardWrapper.java =================================================================== --- trunk/java/org/apache/catalina/core/StandardWrapper.java 2009-12-10 15:15:31 UTC (rev 1331) +++ trunk/java/org/apache/catalina/core/StandardWrapper.java 2009-12-11 16:41:24 UTC (rev 1332) @@ -869,7 +869,8 @@ public void addInitParameter(String name, String value) { synchronized (parameters) { - parameters.put(name, value); + if (!parameters.containsKey(name)) + parameters.put(name, value); } fireContainerEvent("addInitParameter", name); Modified: trunk/java/org/apache/catalina/deploy/FilterDef.java =================================================================== --- trunk/java/org/apache/catalina/deploy/FilterDef.java 2009-12-10 15:15:31 UTC (rev 1331) +++ trunk/java/org/apache/catalina/deploy/FilterDef.java 2009-12-11 16:41:24 UTC (rev 1332) @@ -162,7 +162,8 @@ * @param value The initialization parameter value */ public void addInitParameter(String name, String value) { - parameters.put(name, value); + if (!parameters.containsKey(name)) + parameters.put(name, value); }