Backport of a regression fix for JDK-8309733 Changes applied cleanly.
------------- Commit messages: - Backport d1d2b55ce0b950e07f6e3761983f73fd58079627 Changes: https://git.openjdk.org/jdk21/pull/59/files Webrev: https://webrevs.openjdk.org/?repo=jdk21&pr=59&range=00 Issue: https://bugs.openjdk.org/browse/JDK-8309733 Stats: 10 lines in 1 file changed: 6 ins; 0 del; 4 mod Patch: https://git.openjdk.org/jdk21/pull/59.diff Fetch: git fetch https://git.openjdk.org/jdk21.git pull/59/head:pull/59 PR: https://git.openjdk.org/jdk21/pull/59