Author: remy.maucherat(a)jboss.com Date: 2009-05-11 17:44:19 -0400 (Mon, 11 May 2009) New Revision: 1048 Modified: trunk/java/org/apache/catalina/startup/ContextConfig.java Log: - Jasper will likely need the actual fragment order (sigh). Modified: trunk/java/org/apache/catalina/startup/ContextConfig.java =================================================================== --- trunk/java/org/apache/catalina/startup/ContextConfig.java 2009-05-11 17:10:57 UTC (rev 1047) +++ trunk/java/org/apache/catalina/startup/ContextConfig.java 2009-05-11 21:44:19 UTC (rev 1048) @@ -341,7 +341,7 @@ public Iterator<String> getWebFragments() { - return webFragments.iterator(); + return order.iterator(); } @@ -1010,7 +1010,7 @@ // Read order from web.xml and fragments (note: if no fragments, skip) WebAbsoluteOrdering absoluteOrdering = context.getWebAbsoluteOrdering(); List<WebOrdering> orderings = new ArrayList<WebOrdering>(); - Iterator<String> jarsWithWebFragments = getWebFragments(); + Iterator<String> jarsWithWebFragments = webFragments.iterator(); HashSet<String> jarsSet = new HashSet<String>(); // Parse the ordering defined in web fragments