Author: markt
Date: Mon Mar 22 13:57:46 2010
New Revision: 926087
URL: http://svn.apache.org/viewvc?rev=926087&view=rev
Log:
Fix some TCK issues. The behaviour is undefined in the spec, so go with the TCK
requirements
Modified:
tomcat/trunk/java/org/apache/catalina/deploy/FilterDef.java
tomcat/trunk/java/org/apache/catalina/deploy/ServletDef.java
Modified: tomcat/trunk/java/org/apache/catalina/deploy/FilterDef.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/FilterDef.java?rev=926087&r1=926086&r2=926087&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/FilterDef.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/FilterDef.java Mon Mar 22
13:57:46 2010
@@ -175,6 +175,11 @@ public class FilterDef implements Serial
*/
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);
}
Modified: tomcat/trunk/java/org/apache/catalina/deploy/ServletDef.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/ServletDef.java?rev=926087&r1=926086&r2=926087&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/ServletDef.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/ServletDef.java Mon Mar 22
13:57:46 2010
@@ -157,6 +157,11 @@ public class ServletDef implements Seria
*/
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);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
