Conversation
3 tasks done
This branch has not been deployed
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.
Closed: #1137
Purpose of the pull request
As title
Out of scope: when encryption fails,
finish()still writes the unencrypted workbook to the caller's stream. That is tracked separately in #1135.What's changed?
WriteContextImpl#doOutputStreamEncrypt07deletes the temp file in one outerfinally.FileOutputStreamis a try-with-resources, so it is closed even whenworkbook.close()throws.FileNotFoundException.When two steps fail, only one exception can be thrown. These are the cases where
doOutputStreamEncrypt07now throws a different one than onmain:mainTests
New cases in
EncryptDataTest:xlsxStreamPasswordWrite_tempFileWriteFails_deletesTempFile: fails onmain.xlsxStreamPasswordWrite_workbookCloseFails_closesTempFileStream: fails onmain.xlsxStreamPasswordWrite_workbookCloseFails_deletesTempFilexlsxStreamPasswordWrite_encryptedWriteFails_deletesTempFilexlsxStreamPasswordWrite_tempFileOpenFails_reportsOpenErrorThe last three pass on
maintoo, since those paths already cleaned up. They guard against regressions.Checklist