oem-ibm: Handle the json parse exception correctly #621
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
jaypadath
force-pushed
the
655145_lic_parse_error
branch
from
f0df9cc to
dd2c4fb
Compare
| if (dataNew.is_discarded()) | ||
| try | ||
| { | ||
| dataNew = Json::parse(jsonFileNew); |
There was a problem hiding this comment.
define dataNew here itself? auto dataNew
There was a problem hiding this comment.
We need to use this dataNew after try-catch, so can't use auto here
| { | ||
| error("Failed to parse the new license json file '{NEW_LIC_JSON}'", | ||
| "NEW_LIC_JSON", newLicJsonFilePath); | ||
| throw InternalFailure(); | ||
| return PLDM_ERROR; |
There was a problem hiding this comment.
return PLDM_ERROR_INVALID_DATA ?
Pavithrab7
suggested changes
Oct 10, 2024
| if (dataNew.is_discarded()) | ||
| try | ||
| { | ||
| dataNew = Json::parse(jsonFileNew); |
There was a problem hiding this comment.
Jay, no need of other two parameters? (nullptr and false)
There was a problem hiding this comment.
Not needed as they are the default args with values as nullptr and true. In fact the intention is to change the third argument to true which matches with default value.
jaypadath
force-pushed
the
655145_lic_parse_error
branch
from
dd2c4fb to
7d0c250
Compare
|
jenkins run tests please |
Pavithrab7
approved these changes
Oct 10, 2024
manojkiraneda
approved these changes
Oct 10, 2024
Comment on lines
+138
to
+144
| info("Setting Pending Attributes {NUMBER}", "NUMBER", | ||
| (int)pendingAttributes.size()); |
There was a problem hiding this comment.
can't we print the attribute names here ? size might not give much clues if we hit this path.
jaypadath
force-pushed
the
655145_lic_parse_error
branch
from
7d0c250 to
a5254e8
Compare
This commit handles the CoD license json parsing exception by correctly catching it and returns the error to the caller. Also made the change to avoid the removal of license json file whenever shared by the host. Tested: Done the sanity testing to verify that json file was kept without removal. Signed-off-by: Jayashankar Padath <[email protected]>
jaypadath
force-pushed
the
655145_lic_parse_error
branch
from
a5254e8 to
266ad67
Compare
ArchanaKakani
pushed a commit
to ArchanaKakani/pldm
that referenced
this pull request
Dec 10, 2024
This commit handles the CoD license json parsing exception by correctly catching it and returns the error to the caller. Also made the change to avoid the removal of license json file whenever shared by the host. Tested: Done the sanity testing to verify that json file was kept without removal. Signed-off-by: Jayashankar Padath <[email protected]>
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.
This commit handles the CoD license json parsing exception by correctly catching it and returs the error to the caller. Also made the change to avoid the removal of license json file whenever shared by the host.
Tested:
Done the sanity testing to verify that json file was kept without removal.