Make Resource URLs module aware

Author: olpaw

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Resources.java

@@ -159,9 +159,9 @@ public static ResourceStorageEntry get(String moduleName, String resourceName) {
         return singleton().resources.get(Pair.create(moduleName, resourceName));
     }
 
-    private static URL createURL(String resourceName, int index) {
+    private static URL createURL(String moduleName, String resourceName, int index) {
         try {
-            return new URL(JavaNetSubstitutions.RESOURCE_PROTOCOL, null, -1, resourceName,
+            return new URL(JavaNetSubstitutions.RESOURCE_PROTOCOL, moduleName, -1, resourceName,
                             new URLStreamHandler() {
                                 @Override
                                 protected URLConnection openConnection(URL url) {
@@ -222,7 +222,7 @@ public static Enumeration<URL> createURLs(String moduleName, String resourceName
         int numberOfResources = entry.getData().size();
         List<URL> resourcesURLs = new ArrayList<>(numberOfResources);
         for (int index = 0; index < numberOfResources; index++) {
-            resourcesURLs.add(createURL(canonicalResourceName, index));
+            resourcesURLs.add(createURL(moduleName, canonicalResourceName, index));
         }
         return Collections.enumeration(resourcesURLs);
     }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/resources/ResourceURLConnection.java

@@ -63,7 +63,9 @@ public void connect() {
         connected = true;
 
         String resourceName = resolveName(url.getPath());
-        ResourceStorageEntry entry = Resources.get(Resources.toCanonicalForm(resourceName));
+        String hostName = url.getHost();
+        String hostNameOrNull = hostName != null && !hostName.isEmpty() ? hostName : null;
+        ResourceStorageEntry entry = Resources.get(hostNameOrNull, Resources.toCanonicalForm(resourceName));
         if (entry != null) {
             List<byte[]> bytes = entry.getData();
             if (index < bytes.size()) {