Skip to content

Conversation

@rm-gh-8
Copy link
Contributor

@rm-gh-8 rm-gh-8 commented Dec 4, 2025

Backporting JDK-8368500: ContextClassLoader cannot be reset on threads in ForkJoinPool.commonPool()

For parity with Oracle JDK.

With the Security Manager permanently disabled in JDK 24, setCCL allows setting a custom context class loader but prevents resetting it back to the system class loader before executing subsequent task code. This change relaxes the restriction to allow resetting to the system class loader.

Ran GHA Sanity Checks (passed), jtreg tier1 tests (passed) and related tests (passed) on linux-x64, linux-aarch64, macos-aarch64 and windows-x64:

(Passed) - make test-tier1
(Passed) - make test TEST=test/jdk/java/util/concurrent/forkjoin/ContextClassLoaderTest.java

Results are attached.

linux-aarch64-jtreg-tier1.log
linux-aarch64-specific-test.log
linux-x64-jtreg-tier1.log
linux-x64-specific-test.log
macos-aarch64-jtreg-tier1.log
macos-aarch64-specific-test.log
windows-x64-jtreg-tier1.log
windows-x64-specific-test.log


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8368500 needs maintainer approval

Issue

  • JDK-8368500: ContextClassLoader cannot be reset on threads in ForkJoinPool.commonPool() (Bug - P4 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 65

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 4, 2025

👋 Welcome back rm-gh-8! 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
Copy link

openjdk bot commented Dec 4, 2025

@rm-gh-8 This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

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

8368500: ContextClassLoader cannot be reset on threads in ForkJoinPool.commonPool()

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 62 new commits pushed to the master branch:

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.

➡️ 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).

@openjdk openjdk bot changed the title Backport 6f8d07ae21e49f87f64a5d4e10c930c4447ec8b6 8368500: ContextClassLoader cannot be reset on threads in ForkJoinPool.commonPool() Dec 4, 2025
@openjdk
Copy link

openjdk bot commented Dec 4, 2025

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

@openjdk openjdk bot added backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required labels Dec 4, 2025
@rm-gh-8 rm-gh-8 marked this pull request as ready for review December 4, 2025 19:11
@openjdk
Copy link

openjdk bot commented Dec 4, 2025

⚠️ @rm-gh-8 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.

@openjdk openjdk bot added the rfr Pull request is ready for review label Dec 4, 2025
@rm-gh-8
Copy link
Contributor Author

rm-gh-8 commented Dec 4, 2025

/approval request for backport of JDK-8368500: ContextClassLoader cannot be reset on threads in ForkJoinPool.commonPool().

For parity with Oracle JDK.

@openjdk
Copy link

openjdk bot commented Dec 4, 2025

@rm-gh-8
8368500: The approval request has been created successfully.

@openjdk openjdk bot added the approval Requires approval; will be removed when approval is received label Dec 4, 2025
@mlbridge
Copy link

mlbridge bot commented Dec 4, 2025

Webrevs

@openjdk openjdk bot removed the approval Requires approval; will be removed when approval is received label Dec 5, 2025
@rm-gh-8
Copy link
Contributor Author

rm-gh-8 commented Dec 5, 2025

/approval request for backport of JDK-8368500: ContextClassLoader cannot be reset on threads in ForkJoinPool.commonPool().

For parity with Oracle JDK.

@openjdk
Copy link

openjdk bot commented Dec 5, 2025

@rm-gh-8
8368500: The approval request was already up to date.

@openjdk openjdk bot added the approval Requires approval; will be removed when approval is received label Dec 5, 2025
@GoeLin
Copy link
Member

GoeLin commented Dec 9, 2025

Hi Roland,
"Ran GHA Sanity Checks (passed), jtreg tier1 tests (passed) and related tests (passed) on linux-x64, linux-aarch64, macos-aarch64 and windows-x64:"

My browser shows in the tab a green tick. That tells me as approver that tier1 has passed on linux-x64, macos-x64 and windows-x64. This are the basic sanity tests. You don't need to mention this.
Running tier1 on linux-aarch is an extra test. Thanks for running this.
If you spend time on running tests, run tier2! If you run related tests, run all of a larger set, maybe make test TEST=test/jdk/java/util/concurrent/ ?

I run tier 1-4, some with -Xcomp, some sap tests, jck/tck, on ppc, alpine, aix and the mainstream platforms, etc on all my backports.

@rm-gh-8
Copy link
Contributor Author

rm-gh-8 commented Dec 9, 2025

Adding related tests:

(Passed) - make test TEST=test/jdk/java/util/concurrent

linux-aarch64-specific-test.log
linux-x64-specific-test.log
macos-aarch64-specific-test.log
windows-x64-specific-test.log

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed approval Requires approval; will be removed when approval is received labels Dec 10, 2025
@rm-gh-8
Copy link
Contributor Author

rm-gh-8 commented Dec 10, 2025

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Dec 10, 2025
@openjdk
Copy link

openjdk bot commented Dec 10, 2025

@rm-gh-8
Your change (at version a38407f) is now ready to be sponsored by a Committer.

@shipilev
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Dec 10, 2025

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

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Dec 10, 2025
@openjdk openjdk bot closed this Dec 10, 2025
@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Dec 10, 2025
@openjdk openjdk bot removed rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Dec 10, 2025
@openjdk
Copy link

openjdk bot commented Dec 10, 2025

@shipilev @rm-gh-8 Pushed as commit dcd89eb.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

3 participants