[jdk17u-dev] RFR: 8195589: T6587786.java failed after JDK-8189997

[Martin Doerr]

Backport of [JDK-8195589](https://bugs.openjdk.java.net/browse/JDK-8195589).

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

Commit messages:
 - Backport 21b62fef335aa981a239415532fa8b804fb5676d

Changes: https://git.openjdk.org/jdk17u-dev/pull/1643/files
 Webrev: https://webrevs.openjdk.org/?repo=jdk17u-dev&pr=1643&range=00
  Issue: https://bugs.openjdk.org/browse/JDK-8195589
  Stats: 11 lines in 2 files changed: 3 ins; 1 del; 7 mod
  Patch: https://git.openjdk.org/jdk17u-dev/pull/1643.diff
  Fetch: git fetch https://git.openjdk.org/jdk17u-dev.git pull/1643/head:pull/1643

PR: https://git.openjdk.org/jdk17u-dev/pull/1643