8336692: Redo fix for JDK-8284620

[GoeLin]

I backport this for parity with 21.0.6-oracle

Resolved due to nullptr differences.

---

Progress

• Change must be properly reviewed (1 review required, with at least 1 Reviewer)
• Change must not contain extraneous whitespace
• Commit message must refer to an issue
• JDK-8336692 needs maintainer approval

Issue

• JDK-8336692: Redo fix for JDK-8284620 (Bug - P4)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk17u-dev.git pull/3112/head:pull/3112
$ git checkout pull/3112

Update a local copy of the PR:
$ git checkout pull/3112
$ git pull https://git.openjdk.org/jdk17u-dev.git pull/3112/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3112

View PR using the GUI difftool:
$ git pr show -t 3112

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/3112.diff

Using Webrev

Link to Webrev Comment

[bridgekeeper]

👋 Welcome back goetz! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

[openjdk]

❗ This change is not yet ready to be integrated.
See the Progress checklist in the description for automated requirements.

[openjdk]

This backport pull request has now been updated with issue from the original commit.

[mlbridge]

Webrevs

• 00: Full (880aafd3)