--- java/org/apache/catalina/webresources/DirResourceSet.java	(revision 1633538)
+++ java/org/apache/catalina/webresources/DirResourceSet.java	(arbetskopia)
@@ -20,6 +20,7 @@ 
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.Arrays;
 import java.util.Set;
 
 import org.apache.catalina.LifecycleException;
@@ -150,6 +151,7 @@ 
             if (f != null) {
                 File[] list = f.listFiles();
                 if (list != null) {
+                    Arrays.sort(list);
                     for (File entry : list) {
                         StringBuilder sb = new StringBuilder(path);
                         if (path.charAt(path.length() - 1) != '/') {
--- java/org/apache/catalina/webresources/StandardRoot.java	(revision 1633538)
+++ java/org/apache/catalina/webresources/StandardRoot.java	(arbetskopia)
@@ -22,13 +22,7 @@ 
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
 import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
 import javax.management.ObjectName;
@@ -127,6 +121,7 @@ 
             for (WebResourceSet webResourceSet : list) {
                 if (!webResourceSet.getClassLoaderOnly()) {
                     String[] entries = webResourceSet.list(path);
+                    Arrays.sort(entries);
                     for (String entry : entries) {
                         result.add(entry);
                     }