From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 22 Mar 2010 13:57:46 +0000 (+0000)
Subject: Fix some TCK issues. The behaviour is undefined in the spec, so go with the TCK requi... 
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=0ea122ad6889b419f704706bb8d4e355b2fc08f5;p=tomcat7.0

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

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 95c92af0e..3b1d13254 100644
--- 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 881b4ef7a..38b44c6ca 100644
--- 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);
 
     }