ResourceCollection should not have a path

jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java

@@ -230,7 +230,10 @@ public long length()
      */
     public InputStream newInputStream() throws IOException
     {
-        return Files.newInputStream(getPath(), StandardOpenOption.READ);
+        Path path = getPath();
+        if (path == null)
+            return null;
+        return Files.newInputStream(path, StandardOpenOption.READ);
     }
 
     /**
@@ -241,6 +244,9 @@ public InputStream newInputStream() throws IOException
      */
     public ReadableByteChannel newReadableByteChannel() throws IOException
     {
+        Path path = getPath();
+        if (path == null)
+            return null;
         return Files.newByteChannel(getPath(), StandardOpenOption.READ);
     }
 

jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/resource/ResourceCollection.java

@@ -13,11 +13,8 @@
 
 package org.eclipse.jetty.util.resource;
 
-import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.io.InputStream;
 import java.net.URI;
-import java.nio.channels.ReadableByteChannel;
 import java.nio.file.Path;
 import java.time.Instant;
 import java.util.ArrayList;
@@ -166,88 +163,36 @@ public boolean exists()
     @Override
     public Path getPath()
     {
-        for (Resource r : _resources)
-        {
-            Path p = r.getPath();
-            if (p != null)
-                return p;
-        }
-        return null;
-    }
-
-    @Override
-    public InputStream newInputStream() throws IOException
-    {
-        for (Resource r : _resources)
-        {
-            if (!r.exists())
-            {
-                // Skip, cannot open anyway
-                continue;
-            }
-            InputStream is = r.newInputStream();
-            if (is != null)
-            {
-                return is;
-            }
-        }
-
-        throw new FileNotFoundException("Resource does not exist");
-    }
-
-    @Override
-    public ReadableByteChannel newReadableByteChannel() throws IOException
-    {
-        for (Resource r : _resources)
-        {
-            ReadableByteChannel channel = r.newReadableByteChannel();
-            if (channel != null)
-            {
-                return channel;
-            }
-        }
         return null;
     }
 
     @Override
     public String getName()
     {
-        for (Resource r : _resources)
-        {
-            String name = r.getName();
-            if (name != null)
-            {
-                return name;
-            }
-        }
         return null;
     }
 
     @Override
     public String getFileName()
     {
+        String filename = null;
+        // return a non-null filename only if all resources agree on the same name.
         for (Resource r : _resources)
         {
-            String filename = r.getFileName();
-            if (filename != null)
-            {
-                return filename;
-            }
+            String fn = r.getFileName();
+            if (fn == null)
+                return null;
+            if (filename == null)
+                filename = fn;
+            else if (!filename.equals(fn))
+                return null;
         }
-        return null;
+        return filename;
     }
 
     @Override
     public URI getURI()
     {
-        for (Resource r : _resources)
-        {
-            URI uri = r.getURI();
-            if (uri != null)
-            {
-                return uri;
-            }
-        }
         return null;
     }