Author: markt Date: Thu Sep 19 12:15:20 2013 New Revision: 1524707 URL: http://svn.apache.org/r1524707 Log: Collection->List since order is important
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java tomcat/trunk/java/org/apache/catalina/startup/WebappServiceLoader.java Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1524707&r1=1524706&r2=1524707&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Thu Sep 19 12:15:20 2013 @@ -26,7 +26,6 @@ import java.net.URISyntaxException; import java.net.URL; import java.net.URLConnection; import java.util.ArrayList; -import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; @@ -1592,7 +1591,7 @@ public class ContextConfig implements Li */ protected void processServletContainerInitializers(ServletContext servletContext) { - Collection<ServletContainerInitializer> detectedScis; + List<ServletContainerInitializer> detectedScis; try { WebappServiceLoader<ServletContainerInitializer> loader = new WebappServiceLoader<>(servletContext); 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=1524707&r1=1524706&r2=1524707&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:15:20 2013 @@ -24,7 +24,6 @@ import java.io.InputStreamReader; import java.net.URL; import java.nio.charset.StandardCharsets; import java.util.ArrayList; -import java.util.Collection; import java.util.Collections; import java.util.Enumeration; import java.util.HashSet; @@ -74,7 +73,7 @@ public class WebappServiceLoader<T> { * @return an unmodifiable collection of service providers * @throws IOException if there was a problem loading any service */ - public Collection<T> load(Class<T> serviceType) throws IOException { + public List<T> load(Class<T> serviceType) throws IOException { String configFile = SERVICES + serviceType.getName(); Set<String> servicesFound = new HashSet<>(); @@ -149,7 +148,7 @@ public class WebappServiceLoader<T> { } } - Collection<T> loadServices(Class<T> serviceType, Set<String> servicesFound) + List<T> loadServices(Class<T> serviceType, Set<String> servicesFound) throws IOException { ClassLoader loader = context.getClassLoader(); List<T> services = new ArrayList<>(servicesFound.size()); @@ -162,6 +161,6 @@ public class WebappServiceLoader<T> { throw new IOException(e); } } - return Collections.unmodifiableCollection(services); + return Collections.unmodifiableList(services); } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org