Skip to content

Commit e791d38

Browse files
committed
Ensure java.se module does not participate in modulePathRequiredModules
1 parent 9e23cc2 commit e791d38

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@
9595
import com.oracle.svm.core.util.ArchiveSupport;
9696
import com.oracle.svm.core.util.ClasspathUtils;
9797
import com.oracle.svm.core.util.ExitStatus;
98-
import com.oracle.svm.shared.util.VMError;
9998
import com.oracle.svm.driver.MacroOption.EnabledOption;
10099
import com.oracle.svm.driver.MacroOption.Registry;
101100
import com.oracle.svm.driver.launcher.ContainerSupport;
@@ -107,6 +106,7 @@
107106
import com.oracle.svm.hosted.NativeImageSystemClassLoader;
108107
import com.oracle.svm.hosted.util.JDKArgsUtils;
109108
import com.oracle.svm.shared.util.StringUtil;
109+
import com.oracle.svm.shared.util.VMError;
110110
import com.oracle.svm.util.GuestAccess;
111111
import com.oracle.svm.util.LogUtils;
112112
import com.oracle.svm.util.ModuleSupport;
@@ -1896,6 +1896,10 @@ Set<String> modulePathRequiredModules(Collection<Path> modulePath) {
18961896

18971897
while (!discoveryQueue.isEmpty()) {
18981898
ModuleReference module = discoveryQueue.poll();
1899+
if ("java.se".equals(module.descriptor().name())) {
1900+
/* Skip java.se-module pseudo-dependencies */
1901+
continue;
1902+
}
18991903
Set<String> requiredModules = getRequiredModules(module);
19001904
List<ModuleReference> requiredModuleReferences = requiredModules.stream()
19011905
.map(mn -> modules.getOrDefault(mn, null))

0 commit comments

Comments
 (0)