8339882: Replace ThreadLocalStorage::thread with Thread::current_or_null in jdk8 backport of JDK-8183925

[benty-amzn]

trafficstars

This change replaces 3 instances of ThreadLocalStorage::thread with Thread::current_or_null to ensure that ThreadLocalStorage::is_initialized is checked before attempting to get the current thread.

Change passes all tier1 tests locally on Linux x86_64 and Windows x86_64

---

Progress

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

Issue

• JDK-8339882: Replace ThreadLocalStorage::thread with Thread::current_or_null in jdk8 backport of JDK-8183925 (Bug - P4 - Requested)

Reviewers

• Paul Hohensee (@phohensee - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 576

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

Using diff file

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

Webrev

Link to Webrev Comment

[bridgekeeper[bot]]

:wave: Welcome back btaylor! 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[bot]]

@benty-amzn This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8339882: Replace ThreadLocalStorage::thread with Thread::current_or_null in jdk8 backport of JDK-8183925

Reviewed-by: phh, andrew

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 32 new commits pushed to the master branch:

• ed3d731386bf4f6819d5e5f69376e520df3a6262: 8342841: [8u] Separate jdk_security_infra tests from jdk_tier1
• 1d2f46702819a866f5291a0e6338ea0c7ccc1927: 8189687: Swing: Invalid position of candidate pop-up of InputMethod in Hi-DPI on Windows
• 41f479c4801ebbf96e1d6bebe1d26d3a5f7a4dc1: 8133287: (fs) java/nio/file/Files/probeContentType/ParallelProbes.java should use othervm mode
• 7e1ea515911827915c27c6568585c6c7906a74d9: 8339133: [8u] Profiler crashes at guarantee(is_result_safe || is_in_asgct()): unsafe access to zombie method
• 31b88042fba46e87fba83e8bfd43ae0ecb5a9afd: Merge
• 618917eb093243de2c5d7e83d4688bfe9ad04985: 8341059: Change Entrust TLS distrust date to November 12, 2024
• 1c1afe3188df5621b5523ae9a06ad39c8a253589: 8341057: Add 2 SSL.com TLS roots
• e976b99775c95013431b7119a61dac3409b3bf16: 8335713: Enhance vectorization analysis
• c5508ab0a6f565bb774ccf786f3290e59f5ab116: 8332644: Improve graph optimizations
• da6b2652f5afb1270140d1bc680f2ef3d8f9c51a: 8290367: Update default value and extend the scope of com.sun.jndi.ldap.object.trustSerialData system property
• ... and 22 more: https://git.openjdk.org/jdk8u-dev/compare/b7348860e89a8aa4466caf7eea1fe628f5b8942a...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@phohensee, @gnu-andrew) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

[mlbridge[bot]]

Webrevs

• 00: Full (cb59935d)

[openjdk[bot]]

⚠️ @benty-amzn This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

[benty-amzn]

Checked the jtreg failures in github actions and I believe they're all unrelated to this change. I also see identical failures on at least one other open PR.

[benty-amzn]

/approval request Change 3 instances of ThreadLocalStorage::thread with Thread::current_or_null to retroactively make JDK-8183925 cleaner and ensure that ThreadLocalStorage::is_initialized is checked before attempting to get the current thread.

[openjdk[bot]]

@benty-amzn 8339882: The approval request has been created successfully.

[bridgekeeper[bot]]

@benty-amzn This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 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!

[bridgekeeper[bot]]

@benty-amzn This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 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!

[bridgekeeper[bot]]

@benty-amzn This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 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!

[bridgekeeper[bot]]

@benty-amzn This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 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!

[gnu-andrew]

/approve yes

[openjdk[bot]]

@gnu-andrew 8339882: The approval request has been approved.

[benty-amzn]

/integrate

[openjdk[bot]]

@benty-amzn Your change (at version cb59935d4bb8ebe9342badab61f29c364f53f487) is now ready to be sponsored by a Committer.

[phohensee]

/sponsor

[openjdk[bot]]

Going to push as commit e4297a70459accd845420180f9bae19b78fe340e. Since your change was applied there have been 32 commits pushed to the master branch:

• ed3d731386bf4f6819d5e5f69376e520df3a6262: 8342841: [8u] Separate jdk_security_infra tests from jdk_tier1
• 1d2f46702819a866f5291a0e6338ea0c7ccc1927: 8189687: Swing: Invalid position of candidate pop-up of InputMethod in Hi-DPI on Windows
• 41f479c4801ebbf96e1d6bebe1d26d3a5f7a4dc1: 8133287: (fs) java/nio/file/Files/probeContentType/ParallelProbes.java should use othervm mode
• 7e1ea515911827915c27c6568585c6c7906a74d9: 8339133: [8u] Profiler crashes at guarantee(is_result_safe || is_in_asgct()): unsafe access to zombie method
• 31b88042fba46e87fba83e8bfd43ae0ecb5a9afd: Merge
• 618917eb093243de2c5d7e83d4688bfe9ad04985: 8341059: Change Entrust TLS distrust date to November 12, 2024
• 1c1afe3188df5621b5523ae9a06ad39c8a253589: 8341057: Add 2 SSL.com TLS roots
• e976b99775c95013431b7119a61dac3409b3bf16: 8335713: Enhance vectorization analysis
• c5508ab0a6f565bb774ccf786f3290e59f5ab116: 8332644: Improve graph optimizations
• da6b2652f5afb1270140d1bc680f2ef3d8f9c51a: 8290367: Update default value and extend the scope of com.sun.jndi.ldap.object.trustSerialData system property
• ... and 22 more: https://git.openjdk.org/jdk8u-dev/compare/b7348860e89a8aa4466caf7eea1fe628f5b8942a...master

Your commit was automatically rebased without conflicts.

[openjdk[bot]]

@phohensee @benty-amzn Pushed as commit e4297a70459accd845420180f9bae19b78fe340e.

:bulb: You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.