Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x

Signed-off-by: gregw <gregw@webtide.com>
jetty · Oct 28, 2020 · c793b54 · c793b54
2 parents 651f23e + 6698a31
commit c793b54
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/resource/ResourceCollection.java b/jetty-util/src/main/java/org/eclipse/jetty/util/resource/ResourceCollection.java
@@ -26,6 +26,7 @@
 import java.net.URI;
 import java.nio.channels.ReadableByteChannel;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
@@ -416,14 +417,17 @@ public long length()
     public String[] list()
     {
         assertResourcesSet();
-
         HashSet<String> set = new HashSet<>();
         for (Resource r : _resources)
         {
-            Collections.addAll(set, r.list());
+            String[] list = r.list();
+            if (list != null)
+                Collections.addAll(set, list);
         }
 
-        return (String[])set.stream().sorted().toArray();
+        String[] result = set.toArray(new String[0]);
+        Arrays.sort(result);
+        return result;
     }
 
     @Override

diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceCollectionTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceCollectionTest.java
@@ -23,6 +23,7 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.nio.file.Path;
+import java.util.Arrays;
 
 import org.eclipse.jetty.toolchain.test.FS;
 import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
@@ -33,7 +34,10 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.emptyArray;
 import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -175,6 +179,19 @@ private void assertThrowIllegalStateException(ResourceCollection coll)
         });
     }
 
+    @Test
+    public void testList() throws Exception
+    {
+        ResourceCollection rc1 = new ResourceCollection(
+            Resource.newResource("src/test/resources/org/eclipse/jetty/util/resource/one/"),
+            Resource.newResource("src/test/resources/org/eclipse/jetty/util/resource/two/"),
+            Resource.newResource("src/test/resources/org/eclipse/jetty/util/resource/three/"));
+
+        assertThat(Arrays.asList(rc1.list()), contains("1.txt", "2.txt", "3.txt", "dir/"));
+        assertThat(Arrays.asList(rc1.addPath("dir").list()), contains("1.txt", "2.txt", "3.txt"));
+        assertThat(rc1.addPath("unknown").list(), emptyArray());
+    }
+
     @Test
     public void testMultipleSources1() throws Exception
     {