[type: bug] Fix thread safety issue with shared static CONTEXT in ExpressionGenerator (#6880) - #6995
Open
zhang-arvin wants to merge 1 commit into
Open
Conversation
…ressionGenerator (apache#6880) Signed-off-by: zhang-arvin <arvin.zhang@htx-inc.com>
Aias00
approved these changes
Sep 2, 2026
Aias00
left a comment
Contributor
There was a problem hiding this comment.
Summary
Correct concurrency fix for the mock expression generators.
Root cause (confirmed)
ExpressionGenerator (and StandardExpressionGenerator) held a private static final EvaluationContext CONTEXT that was mutated per request via CONTEXT.setVariable("req", mockRequest) before getValue(CONTEXT). Because the context was shared and mutable, concurrent mock evaluations raced on the req variable (and any other context state), producing cross-request interference or inconsistent results.
What the fix does right
- Replacing the shared static with a fresh
initContext()perdoGeneratecall eliminates the shared mutable state — each invocation gets its ownEvaluationContext. - The static
SpelExpressionParser PARSERremains shared, which is safe:SpelExpressionParserand the parsedExpressionobjects are documented thread-safe, so the parser was never the problem — only the context. - Verified
initContext()returns a newEvaluationContexteach call, and no other references to the removed staticCONTEXTremain in eitherExpressionGeneratororStandardExpressionGenerator.
Verdict
Approve. No blocking issues.
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
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.
Closes #6880