[jdk21u-dev] RFR: 8363720: Follow up to JDK-8360411 with post review comments

[Rui Li]

A clean backport for JDK-8363720. Backporting it for parity with oracle.

Tests are running. The prerequisite JDK-8360411 is already in 21.

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

Commit messages:
 - Backport a5e0c9d0c52e028321bb38e471ce98e389e67fe1

Changes: https://git.openjdk.org/jdk21u-dev/pull/2283/files
  Webrev: https://webrevs.openjdk.org/?repo=jdk21u-dev&pr=2283&range=00
  Issue: https://bugs.openjdk.org/browse/JDK-8363720
  Stats: 28 lines in 1 file changed: 8 ins; 7 del; 13 mod
  Patch: https://git.openjdk.org/jdk21u-dev/pull/2283.diff
  Fetch: git fetch https://git.openjdk.org/jdk21u-dev.git pull/2283/head:pull/2283

PR: https://git.openjdk.org/jdk21u-dev/pull/2283