Backport: 8a47429dc065ad7645a40fa2350d043ef4606d92

[backwaterred]

trafficstars

Trial backport of JDK-8295944. Which should make it possible to backport JDK-8305906 without issue.

---

Progress

• [ ] Change must be properly reviewed (1 review required, with at least 1 Reviewer)
• [x] Change must not contain extraneous whitespace
• [ ] Commit message must refer to an issue

Integration blockers

 ⚠️ The commit message does not reference any issue. To add an issue reference to this PR, edit the title to be of the format issue number: message. (failed with updated jcheck configuration in pull request)  ⚠️ Too few reviewers with at least role reviewer found (have 0, need at least 1) (failed with updated jcheck configuration in pull request)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1682

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

Using diff file

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

[bridgekeeper[bot]]

:wave: Welcome back tsteele! 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.

[bridgekeeper[bot]]

@backwaterred This pull request has been inactive for more than 8 weeks and will be automatically closed if another 8 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

[openjdk[bot]]

@backwaterred this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout backport/8295944
git fetch https://git.openjdk.org/jdk17u-dev.git master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

[bridgekeeper[bot]]

@backwaterred This pull request has been inactive for more than 8 weeks and will be automatically closed if another 8 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

[openjdk[bot]]

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

[bridgekeeper[bot]]

@backwaterred This pull request has been inactive for more than 8 weeks and will be automatically closed if another 8 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!