[GR-65845] Prevent -H:ExcludeResources=... from excluding directory resources.

olpaw · olpaw · commit 6d02d4312980 · 2025-06-27T00:18:11.000Z
PullRequest: graal/21233
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ResourcesFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ResourcesFeature.java
@@ -546,7 +546,7 @@ public List<ConditionWithOrigin> isIncluded(Module module, String resourceName,
                 if (!rp.moduleNameMatches(moduleName)) {
                     continue;
                 }
-                if (rp.pattern.matcher(resourceName).matches() || rp.pattern.matcher(relativePathWithTrailingSlash).matches()) {
+                if (rp.pattern.matcher(resourceName).matches()) {
                     return List.of(); // nothing should match excluded resource
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -546,7 +546,7 @@ public List<ConditionWithOrigin> isIncluded(Module module, String resourceName,`
`546`	`546`	`if (!rp.moduleNameMatches(moduleName)) {`
`547`	`547`	`continue;`
`548`	`548`	`}`
`549`		`- if (rp.pattern.matcher(resourceName).matches() \|\| rp.pattern.matcher(relativePathWithTrailingSlash).matches()) {`
	`549`	`+ if (rp.pattern.matcher(resourceName).matches()) {`
`550`	`550`	`return List.of(); // nothing should match excluded resource`
`551`	`551`	`}`
`552`	`552`	`}`