[jdk21u-dev] RFR: 8322809: SystemModulesMap::classNames and moduleNames arrays do not match the order [v2]

[Severin Gehwolf]

On Mon, 2 Dec 2024 08:10:39 GMT, Goetz Lindenmaier <goetz at openjdk.org> wrote:

>> Resolved SystemModulesPlugin.java due to context (ClassFile.of() <--> Classfile) 
>> 
>> The patch is based on the commit to 23, the version for 22/22.0.1 is identical.
>> 
>> I can reproduce the error with the test, and the patch fixes the issue. 
>> 
>> I had to adapt the tests because "8317620: Build JDK tools with ModuleMainClass attribute" is missing in 21.
>> jdk.jfr has no main, so I exclude it from the tests.
>
> Goetz Lindenmaier has updated the pull request incrementally with one additional commit since the last revision:
> 
>   Remove jdk.jfr from net.foo module-info

Please remove the commented out modules as well. Good otherwise.

test/jdk/tools/jlink/plugins/SystemModuleDescriptors/src/com.foo/com/foo/Main.java line 41:

> 39:         checkMainClass("com.foo", "com.foo.Main");
> 40:         checkMainClass("net.foo", "net.foo.Main");
> 41:         Stream.of("jdk.httpserver"/*, "jdk.jfr"*/).forEach(mn ->

Suggestion:

        Stream.of("jdk.httpserver").forEach(mn ->

test/jdk/tools/jlink/plugins/SystemModuleDescriptors/src/net.foo/net/foo/Main.java line 41:

> 39:         checkMainClass("com.foo", "com.foo.Main");
> 40:         checkMainClass("net.foo", "net.foo.Main");
> 41:         Stream.of("jdk.httpserver"/*, "jdk.jfr"*/).forEach(mn ->

Suggestion:

        Stream.of("jdk.httpserver").forEach(mn ->

-------------

PR Review: https://git.openjdk.org/jdk21u-dev/pull/1189#pullrequestreview-2472143512
PR Review Comment: https://git.openjdk.org/jdk21u-dev/pull/1189#discussion_r1865491404
PR Review Comment: https://git.openjdk.org/jdk21u-dev/pull/1189#discussion_r1865493100