Fix NPE when closing an unopened JpaPagingItemReader - #5541
Open
harrisleesh wants to merge 1 commit into
Open
harrisleesh wants to merge 1 commit into
harrisleesh wants to merge 1 commit into
Conversation
entityManager is only assigned in doOpen() and is @nullable, but doClose() called entityManager.close() with no null check, with the nullness warning suppressed via @SuppressWarnings("DataFlowIssue"). Spring calls close() on every singleton ItemReader bean at context shutdown regardless of whether its step ran, causing an NPE wrapped as ItemStreamException for readers that were never opened. Guard the EntityManager cleanup with a null check while still performing the superclass cleanup, mirroring the fix applied to JpaCursorItemReader in spring-projectsGH-5486. Fixes spring-projects#5539 Signed-off-by: seonghun lee <harrisleesh@gmail.com>
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
1 participant
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.
entityManageris only assigned indoOpen()and is@Nullable, butdoClose()calledentityManager.close()with no null check (the nullness warning was suppressed via@SuppressWarnings("DataFlowIssue")). Spring callsclose()on every singletonItemReaderbean at context shutdown regardless of whether its step ran, causing an NPE wrapped asItemStreamExceptionfor readers that were never opened.This guards the
EntityManagercleanup with a null check while still performing the superclass cleanup, mirroring the fix applied toJpaCursorItemReaderin #5486 / #5489, and adds a regression test.Fixes #5539