View | Details | Raw Unified | Return to bug 57129
Collapse All | Expand All

(-)java/org/apache/catalina/webresources/DirResourceSet.java (+2 lines)
Lines 20-25 Link Here
20
import java.io.FileOutputStream;
20
import java.io.FileOutputStream;
21
import java.io.IOException;
21
import java.io.IOException;
22
import java.io.InputStream;
22
import java.io.InputStream;
23
import java.util.Arrays;
23
import java.util.Set;
24
import java.util.Set;
24
25
25
import org.apache.catalina.LifecycleException;
26
import org.apache.catalina.LifecycleException;
Lines 150-155 Link Here
150
            if (f != null) {
151
            if (f != null) {
151
                File[] list = f.listFiles();
152
                File[] list = f.listFiles();
152
                if (list != null) {
153
                if (list != null) {
154
                    Arrays.sort(list);
153
                    for (File entry : list) {
155
                    for (File entry : list) {
154
                        StringBuilder sb = new StringBuilder(path);
156
                        StringBuilder sb = new StringBuilder(path);
155
                        if (path.charAt(path.length() - 1) != '/') {
157
                        if (path.charAt(path.length() - 1) != '/') {
(-)java/org/apache/catalina/webresources/StandardRoot.java (-7 / +2 lines)
Lines 22-34 Link Here
22
import java.net.MalformedURLException;
22
import java.net.MalformedURLException;
23
import java.net.URISyntaxException;
23
import java.net.URISyntaxException;
24
import java.net.URL;
24
import java.net.URL;
25
import java.util.ArrayList;
25
import java.util.*;
26
import java.util.Collections;
27
import java.util.HashSet;
28
import java.util.LinkedHashSet;
29
import java.util.List;
30
import java.util.Locale;
31
import java.util.Set;
32
import java.util.concurrent.ConcurrentHashMap;
26
import java.util.concurrent.ConcurrentHashMap;
33
27
34
import javax.management.ObjectName;
28
import javax.management.ObjectName;
Lines 127-132 Link Here
127
            for (WebResourceSet webResourceSet : list) {
121
            for (WebResourceSet webResourceSet : list) {
128
                if (!webResourceSet.getClassLoaderOnly()) {
122
                if (!webResourceSet.getClassLoaderOnly()) {
129
                    String[] entries = webResourceSet.list(path);
123
                    String[] entries = webResourceSet.list(path);
124
                    Arrays.sort(entries);
130
                    for (String entry : entries) {
125
                    for (String entry : entries) {
131
                        result.add(entry);
126
                        result.add(entry);
132
                    }
127
                    }

Return to bug 57129