On Fri, 29 May 2026 07:52:19 GMT, Xueming Shen <[email protected]> wrote:
> This fixes a regression from JDK-8377070 where `ImageResourcesTree` treated > every image entry path as a package hierarchy. That implicitly assumes > directory path segments cannot contain `.`, which is true for package paths > but not for ordinary resources such as > `META-INF/maven/com.google.code.findbugs/...`. > > The fix handles non-preview `META-INF/` entries as resource paths, preserving > their directory names as-is and avoiding package inference for those > resources. `META-INF/preview/` continues to use the existing package-oriented > handling because those entries represent preview class/package content. > > A regression test was added to `ImageReaderTest` with `META-INF` resources > containing dotted path segments, verifying resource lookup and directory > contents in both preview-enabled and preview-disabled modes. > > This change was developed by @david-beaumont. > > --------- > - [x] I confirm that I make this contribution in accordance with the [OpenJDK > Interim AI Policy](https://openjdk.org/legal/ai). This pull request has now been integrated. Changeset: 92298786 Author: Xueming Shen <[email protected]> URL: https://git.openjdk.org/jdk/commit/92298786486daf092c8eb8f278818441df1f6b51 Stats: 63 lines in 2 files changed: 53 ins; 1 del; 9 mod 8385355: NullPointerException in jdk.tools.jlink.internal.ImageResourcesTree after JDK-8377070 Co-authored-by: David Beaumont <[email protected]> Reviewed-by: alanb ------------- PR: https://git.openjdk.org/jdk/pull/31318
