TRUNK-5031 UpgradeUtil may not close a stream #2107
Merged
Conversation
This file contains 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
|
@JudeNiroshan, thanks for your PR! By analyzing the history of the files in this pull request, we identified @bmamlin and @tomaszmueller to be potential reviewers. |
teleivo
requested changes
Mar 29, 2017
| try { | ||
| FileInputStream fis = new FileInputStream(appDataDir + System.getProperty("file.separator") | ||
| + DatabaseUtil.ORDER_ENTRY_UPGRADE_SETTINGS_FILENAME); | ||
| String filePath = new StringBuilder(appDataDir) |
There was a problem hiding this comment.
@JudeNiroshan dont extract this temp variable. just move the fis into the try-with resource like you did in the other cases.
|
@JudeNiroshan can you please make my requested change so I can merge this. thank you! |
6 tasks
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.
Description of what I changed
UpgradeUtil may not close a stream.
Wrapped PreparedStatements into try-with-resources as well in order to simplify and close the preparedStatement automatically.
Issue I worked on
see https://issues.openmrs.org/browse/TRUNK-5031
Checklist: I completed these to help reviewers :)
My pull request only contains ONE single commit
(the number above, next to the 'Commits' tab is 1).
No? -> read here on how to squash multiple commits into one
My IDE is configured to follow the code style of this project.
No? Unsure? -> configure your IDE, format the code and add the changes with
git add . && git commit --amendI have added tests to cover my changes. (If you refactored
existing code that was well tested you do not have to add tests)
Test cases were not changed. Can not add a new test case to capture the scenario of UpgradeUtil#getConceptIdForUnits getting the file stream being opened as there is no way to throw an runtime exception through the test case.
Properties#load(StringReader)doesn't allow null to be as values. Default it empty string.No? -> write tests and add them to this commit
git add . && git commit --amendI ran
mvn clean packageright before creating this pull request andadded all formatting changes to my commit.
No? -> execute above command
All new and existing tests passed.
No? -> figure out why and add the fix to your commit. It is your responsibility to make sure your code works.
My pull request is based on the latest changes of the master branch.
No? Unsure? -> execute command
git pull --rebase upstream master