Author: markt
Date: Thu Nov 7 19:24:17 2013
New Revision: 1539771
URL: http://svn.apache.org/r1539771
Log:
Add a workaround for a Jira bug (to be removed later) as Jira is being used for
testing
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
Modified: tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java?rev=1539771&r1=1539770&r2=1539771&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java Thu
Nov 7 19:24:17 2013
@@ -24,6 +24,7 @@ import java.net.URISyntaxException;
import java.net.URL;
import java.util.ArrayList;
import java.util.HashSet;
+import java.util.LinkedHashSet;
import java.util.Locale;
import java.util.Set;
@@ -111,7 +112,10 @@ public class StandardRoot extends Lifecy
}
// Set because we don't want duplicates
- HashSet<String> result = new HashSet<>();
+ // LinkedHashSet to retain the order (shouldn't matter but Jira is
+ // sensitive to the order the JARs are returned in).
+ // TODO - Revert to HashSet
+ HashSet<String> result = new LinkedHashSet<>();
for (ArrayList<WebResourceSet> list : allResources) {
for (WebResourceSet webResourceSet : list) {
if (!webResourceSet.getClassLoaderOnly()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
