Skip to content

Fix classloading in ConstructorCache #6233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 8, 2025

Conversation

dagnir
Copy link
Contributor

@dagnir dagnir commented Jul 3, 2025

Use the SDK standard ClassLoaderHelper#getClass to try and load the given class from a ClassLoader.

Previously, we were only looking at the ClassLoader returned by ClassLoaderHelper#contextClassLoader which either returns the Thread's context ClassLoader, or the system ClassLoader if that isn't present. This is an issue because it's possible that neither of these ClassLoaders are correct; we should also be looking at the ClassLoader that loaded the calling class.

As part of this change, the internal Map used in ConstructorCache has been changed. Rather than doing a two-level mapping from String -> (Map of ClassLoader to Class), we have a single level mapping from String -> Class. Class is still referenced via a WeakReference so it is still free to be GC'd at any point.

Motivation and Context

Modifications

Testing

Screenshots (if appropriate)

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)

Checklist

  • I have read the CONTRIBUTING document
  • Local run of mvn install succeeds
  • My code follows the code style of this project
  • My change requires a change to the Javadoc documentation
  • I have updated the Javadoc documentation accordingly
  • I have added tests to cover my changes
  • All new and existing tests passed
  • I have added a changelog entry. Adding a new entry must be accomplished by running the scripts/new-change script and following the instructions. Commit the new file created by the script in .changes/next-release with your changes.
  • My change is to implement 1.11 parity feature and I have updated LaunchChangelog

License

  • I confirm that this pull request can be released under the Apache 2 license

@dagnir dagnir force-pushed the dongie/constructor-cache-classloader-fix branch from 0e72cfc to a23083c Compare July 3, 2025 23:02
@dagnir dagnir force-pushed the dongie/constructor-cache-classloader-fix branch 2 times, most recently from 088f711 to 808e14f Compare July 7, 2025 22:07
@dagnir dagnir marked this pull request as ready for review July 7, 2025 22:08
@dagnir dagnir requested a review from a team as a code owner July 7, 2025 22:08
@dagnir dagnir force-pushed the dongie/constructor-cache-classloader-fix branch from 1ca6200 to da05816 Compare July 7, 2025 22:09
Use the SDK standard ClassLoaderHelper#getClass to try and load the
given class from a ClassLoader.

Previously, we were only looking at the ClassLoader returned by
ClassLoaderHelper#contextClassLoader which either returns the Thread's
context ClassLoader, or the system ClassLoader if that isn't present.
This is an issue because it's possible that neither of these
ClassLoaders are correct; we should also be looking at the ClassLoader
that loaded the calling class.

As part of this change, the internal Map used in ConstructorCache has
been changed. Rather than doing a two-level mapping from String -> (Map
of ClassLoader to Class), we have a single level mapping from String ->
Class. Class is still referenced via a WeakReference so it is still free
to be GC'd at any point.
@dagnir dagnir force-pushed the dongie/constructor-cache-classloader-fix branch from da05816 to 2bf381f Compare July 7, 2025 22:10
@dagnir dagnir requested a review from millems July 8, 2025 18:01
@dagnir dagnir added this pull request to the merge queue Jul 8, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jul 8, 2025
@dagnir dagnir added this pull request to the merge queue Jul 8, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jul 8, 2025
@dagnir dagnir enabled auto-merge July 8, 2025 20:44
Copy link

sonarqubecloud bot commented Jul 8, 2025

@dagnir dagnir added this pull request to the merge queue Jul 8, 2025
Merged via the queue into master with commit 3b96b2e Jul 8, 2025
35 checks passed
Copy link

github-actions bot commented Jul 8, 2025

This pull request has been closed and the conversation has been locked. Comments on closed PRs are hard for our team to see. If you need more assistance, please open a new issue that references this one.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 8, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants