You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2013/09/19 14:50:36 UTC
svn commit: r1524719 -
/tomcat/trunk/java/org/apache/catalina/startup/WebappServiceLoader.java
Author: markt
Date: Thu Sep 19 12:50:36 2013
New Revision: 1524719
URL: http://svn.apache.org/r1524719
Log:
Set->LinkedHashSet as order needs to be retained
Modified:
tomcat/trunk/java/org/apache/catalina/startup/WebappServiceLoader.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/WebappServiceLoader.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/WebappServiceLoader.java?rev=1524719&r1=1524718&r2=1524719&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/WebappServiceLoader.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/WebappServiceLoader.java Thu Sep 19 12:50:36 2013
@@ -26,9 +26,8 @@ import java.nio.charset.StandardCharsets
import java.util.ArrayList;
import java.util.Collections;
import java.util.Enumeration;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
import java.util.List;
-import java.util.Set;
import javax.servlet.ServletContext;
@@ -76,7 +75,7 @@ public class WebappServiceLoader<T> {
public List<T> load(Class<T> serviceType) throws IOException {
String configFile = SERVICES + serviceType.getName();
- Set<String> servicesFound = new HashSet<>();
+ LinkedHashSet<String> servicesFound = new LinkedHashSet<>();
ClassLoader loader = context.getClassLoader();
// if the ServletContext has ORDERED_LIBS, then use that to specify the
@@ -128,7 +127,8 @@ public class WebappServiceLoader<T> {
return loadServices(serviceType, servicesFound);
}
- void parseConfigFile(Set<String> servicesFound, URL url) throws IOException {
+ void parseConfigFile(LinkedHashSet<String> servicesFound, URL url)
+ throws IOException {
try (InputStream is = url.openStream()) {
InputStreamReader in =
new InputStreamReader(is, StandardCharsets.UTF_8);
@@ -148,7 +148,7 @@ public class WebappServiceLoader<T> {
}
}
- List<T> loadServices(Class<T> serviceType, Set<String> servicesFound)
+ List<T> loadServices(Class<T> serviceType, LinkedHashSet<String> servicesFound)
throws IOException {
ClassLoader loader = context.getClassLoader();
List<T> services = new ArrayList<>(servicesFound.size());
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org