Fix some TCK issues. The behaviour is undefined in the spec, so go with the TCK requi...

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@926087 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/deploy/FilterDef.java b/java/org/apache/catalina/deploy/FilterDef.java
index 95c92af..3b1d132 100644 (file)
--- a/java/org/apache/catalina/deploy/FilterDef.java
+++ b/java/org/apache/catalina/deploy/FilterDef.java
@@ -175,6 +175,11 @@ public class FilterDef implements Serializable {
      */
     public void addInitParameter(String name, String value) {
 
+        if (parameters.containsKey(name)) {
+            // The spec does not define this but the TCK expects the first
+            // definition to take precedence
+            return;
+        }
         parameters.put(name, value);
 
     }

diff --git a/java/org/apache/catalina/deploy/ServletDef.java b/java/org/apache/catalina/deploy/ServletDef.java
index 881b4ef..38b44c6 100644 (file)
--- a/java/org/apache/catalina/deploy/ServletDef.java
+++ b/java/org/apache/catalina/deploy/ServletDef.java
@@ -157,6 +157,11 @@ public class ServletDef implements Serializable {
      */
     public void addInitParameter(String name, String value) {
 
+        if (parameters.containsKey(name)) {
+            // The spec does not define this but the TCK expects the first
+            // definition to take precedence
+            return;
+        }
         parameters.put(name, value);
 
     }