Skip to content
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

GH-3238: Fix Unmarshaller to close File resource #3239

Merged
merged 1 commit into from
Apr 2, 2020

Conversation

artembilan
Copy link
Member

Fixes #3238

  • Extract an InputStream from a File payload in the UnmarshallingTransformer
    before parsing an XML.
    Close this InputStream in the finally block to release the file resource

Cherry-pick to 5.2.x, 5.1.x & 4.3.x

Fixes spring-projects#3238

* Extract an `InputStream` from a `File` payload in the `UnmarshallingTransformer`
before parsing an XML.
Close this `InputStream` in the `finally` block to release the file resource

**Cherry-pick to 5.2.x, 5.1.x & 4.3.x**
@artembilan
Copy link
Member Author

@garyrussell ,

I accidentally pushed the fix into master: 24e6be6, but I guess we can fix it over there with subsequent commit after review and merging over here.

Also: it is not going to be cherry-picked clearly into 4.3.x because there is no JUnit 5 yet.
So, let me know and I'll back port this over there fater review and merging!

Sorry for inconvenience

@garyrussell
Copy link
Contributor

LGTM; feel free to cherry-pick/backport.

@artembilan artembilan merged commit 7e52f35 into spring-projects:5.2.x Apr 2, 2020
@artembilan
Copy link
Member Author

Cherry-picked to 5.1.x as 2d00bfc after fixing conflicts.

Back-ported to 4.3.x as 43c5519.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants