TRUNK-5721: Fix ObsService.getObs error when Obs.valueComplex null #4599
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
When saving a complex observation with
ObsService#saveObs
, theComplexObsHandler#saveObs
method gets called only ifcomplexData.getData()
is non-null.openmrs-core/api/src/main/java/org/openmrs/api/impl/ObsServiceImpl.java
Lines 245 to 253 in 4ce7f65
However, it will still be saved to the database.
Then if we call
ObsService#getObs
for that same observation, it will throw the following exception, since theComplexObsHandler#getObs
still tries to read that non-existent file.openmrs-core/api/src/main/java/org/openmrs/obs/handler/AbstractHandler.java
Lines 147 to 149 in 4ce7f65
I Included a test case to reproduce the issue originally reported in TRUNK-5721
The actual code refactoring will be done, once the expected behavior is confirmed.
Issue I worked on
https://openmrs.atlassian.net/issues/TRUNK-5721
Checklist: I completed these to help reviewers :)
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 --amend
I have added tests to cover my changes. (If you refactored
existing code that was well tested you do not have to add tests)
No? -> write tests and add them to this commit
git add . && git commit --amend
I ran
mvn clean package
right 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