Fix AwaitingNonWebApplicationListener await with parent context #15970
+24
−12
Conversation
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
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
This PR fixes the await logic in AwaitingNonWebApplicationListener for
non-web Spring Boot applications using parent–child ApplicationContext
hierarchies.
Previously, the listener could incorrectly participate in the lifecycle when a
child context was present. The listener should only operate on the root,
non-web ApplicationContext, and must ignore child contexts.
Changes
Ensure onApplicationReadyEvent returns early for:
non-root ApplicationContexts
web ApplicationContexts
Add a regression test to verify correct behavior when a non-web application
has a parent–child context hierarchy
Testing
Added testMultipleContextNonWebApplication
Verified that the listener does not enter await state for child contexts
Fixes #13722