Skip to content

Commit 1b8c8b1

Browse files
committed
[GR-74220] Preserve conditional resource metadata in include-all scan path
PullRequest: graal/23615
2 parents c73051f + 49c9e05 commit 1b8c8b1

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ClassLoaderSupportImpl.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,11 +228,12 @@ private static void includeResource(ResourceCollector collector, Module module,
228228
}
229229

230230
private static List<ConditionWithOrigin> shouldIncludeEntry(Module module, ResourceCollector collector, String fileName, URI uri, boolean includeCurrent) {
231+
List<ConditionWithOrigin> conditions = new ArrayList<>(collector.isIncluded(module, fileName, uri));
231232
if (includeCurrent && !(fileName.endsWith(".class") || fileName.endsWith(".jar"))) {
232-
return Collections.singletonList(new ConditionWithOrigin(AccessCondition.unconditional(), "Include all"));
233+
conditions.add(new ConditionWithOrigin(AccessCondition.unconditional(), "Include all"));
233234
}
234235

235-
return collector.isIncluded(module, fileName, uri);
236+
return conditions;
236237
}
237238

238239
@Override

0 commit comments

Comments
 (0)