fix(core): Guard clearSession with session lock to prevent NPE - #5657
Merged
markushi merged 4 commits intoJun 29, 2026
Merged
Conversation
Copy link
Copy Markdown
Member
Sorry, something went wrong.
clearSession() reset the session field without acquiring sessionLock, unlike the other session mutators (startSession, endSession, withSession). This allowed it to null out the session between a null-check and a dereference (e.g. session.clone()) in those locked methods, leading to a NullPointerException. Acquire sessionLock so all session mutations are mutually exclusive. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Copy link
Copy Markdown
📲 Install BuildsAndroid
|
Sorry, something went wrong.
markushi
marked this pull request as ready for review
June 29, 2026 07:37
markushi
requested review from
0xadam-brown,
adinauer,
romtsn and
runningcode
as code owners
June 29, 2026 07:37
romtsn
approved these changes
Jun 29, 2026
Copy link
Copy Markdown
Contributor
Performance metrics 🚀
Baseline results on branch: mainStartup times
App size
|
Sorry, something went wrong.
3 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Reviewers
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
📜 Description
Scope.clearSession() didn't acquire a sessionLock, causing a NPE within Scope.endSession().
Fixes SENTRY-JAVA issue.
📝 Checklist