tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1213906 - in /tomcat/trunk/java/org/apache/catalina: core/ApplicationJspConfigDescriptor.java deploy/WebXml.java
Date Tue, 13 Dec 2011 20:17:40 GMT
Author: markt
Date: Tue Dec 13 20:17:39 2011
New Revision: 1213906

URL: http://svn.apache.org/viewvc?rev=1213906&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52321
Used LinkedHashSet rather than HashSet to preserve order

Modified:
    tomcat/trunk/java/org/apache/catalina/core/ApplicationJspConfigDescriptor.java
    tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationJspConfigDescriptor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationJspConfigDescriptor.java?rev=1213906&r1=1213905&r2=1213906&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationJspConfigDescriptor.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationJspConfigDescriptor.java Tue Dec
13 20:17:39 2011
@@ -19,6 +19,7 @@ package org.apache.catalina.core;
 
 import java.util.Collection;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 
 import javax.servlet.descriptor.JspConfigDescriptor;
 import javax.servlet.descriptor.JspPropertyGroupDescriptor;
@@ -27,7 +28,7 @@ import javax.servlet.descriptor.TaglibDe
 public class ApplicationJspConfigDescriptor implements JspConfigDescriptor {
 
     private Collection<JspPropertyGroupDescriptor> jspPropertyGroups =
-        new HashSet<JspPropertyGroupDescriptor>();
+        new LinkedHashSet<JspPropertyGroupDescriptor>();
 
     private Collection<TaglibDescriptor> taglibs =
         new HashSet<TaglibDescriptor>();

Modified: tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java?rev=1213906&r1=1213905&r2=1213906&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java Tue Dec 13 20:17:39 2011
@@ -398,7 +398,7 @@ public class WebXml {
 
     // jsp-config/jsp-property-group
     private Set<JspPropertyGroup> jspPropertyGroups =
-        new HashSet<JspPropertyGroup>();
+        new LinkedHashSet<JspPropertyGroup>();
     public void addJspPropertyGroup(JspPropertyGroup propertyGroup) {
         jspPropertyGroups.add(propertyGroup);
     }



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


Mime
View raw message