tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Konstantin Kolinko <knst.koli...@gmail.com>
Subject Re: svn commit: r1373621 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/ java/org/apache/catalina/deploy/ java/org/apache/catalina/startup/ webapps/docs/
Date Sat, 18 Aug 2012 15:52:52 GMT
2012/8/16  <markt@apache.org>:
> Author: markt
> Date: Wed Aug 15 20:37:06 2012
> New Revision: 1373621
>
> URL: http://svn.apache.org/viewvc?rev=1373621&view=rev
> Log:
> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53702
> <jsp-property-group> may contain multiple <url-pattern>
>
> Modified:
>     tomcat/tc7.0.x/trunk/   (props changed)
>     tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationJspPropertyGroupDescriptor.java
>     tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/JspPropertyGroup.java
>     tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/WebXml.java
>     tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/WebRuleSet.java
>     tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
>
> Propchange: tomcat/tc7.0.x/trunk/
> ------------------------------------------------------------------------------
>   Merged /tomcat/trunk:r1373618
>

> Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/JspPropertyGroup.java
> URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/JspPropertyGroup.java?rev=1373621&r1=1373620&r2=1373621&view=diff
> ==============================================================================
> --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/JspPropertyGroup.java (original)
> +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/JspPropertyGroup.java Wed Aug
15 20:37:06 2012
> @@ -16,6 +16,7 @@
>   */
>  package org.apache.catalina.deploy;
>
> +import java.util.HashSet;
>  import java.util.LinkedHashSet;
>  import java.util.Set;
>
> @@ -71,11 +72,11 @@ public class JspPropertyGroup {
>      }
>      public Boolean getTrimWhitespace() { return trimWhitespace; }
>
> -    private String urlPattern = null;
> -    public void setUrlPattern(String urlPattern) {
> -        this.urlPattern = urlPattern;
> +    private Set<String> urlPattern = new HashSet<String>();

I think the above would better be a LinkedHashSet. This is to preserve
the ordering of url-patterns when someone dumps merged web.xml.

> +    public void addUrlPattern(String urlPattern) {
> +        this.urlPattern.add(urlPattern);
>      }
> -    public String getUrlPattern() { return this.urlPattern; }
> +    public Set<String> getUrlPatterns() { return this.urlPattern; }
>
>      private String defaultContentType = null;
>      public void setDefaultContentType(String defaultContentType) {
>

Best regards,
Konstantin Kolinko

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message