Fix NPE in s3 scan partition supplier #3317
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
Signed-off-by: Taylor Gray <[email protected]>
graytaylor0
requested review from
chenqi0805,
engechas,
dinujoh,
kkondaka,
asifsmohammed,
dlvenable and
oeyh
as code owners
dlvenable
requested changes
Sep 8, 2023
| @@ -101,7 +101,7 @@ private List<PartitionIdentifier> listFilteredS3ObjectsForBucket(final List<Stri | |||
| final LocalDateTime endDateTime, | |||
| final Map<String, Object> globalStateMap) { | |||
|
|
|||
| Instant mostRecentLastModifiedTimestamp = globalStateMap.containsKey(bucket) ? Instant.parse((String) globalStateMap.get(bucket)) : null; | |||
| Instant mostRecentLastModifiedTimestamp = globalStateMap.containsKey(bucket) && Objects.nonNull(globalStateMap.get(bucket)) ? Instant.parse((String) globalStateMap.get(bucket)) : null; | |||
There was a problem hiding this comment.
globalStateMap.containsKey(bucket) && Objects.nonNull(globalStateMap.get(bucket)) can simplify to globalStateMap.get(bucket) != null
Also, Objects.nonNull is not necessary here. It is intended for use where a Predicate is needed.
Signed-off-by: Taylor Gray <[email protected]>
dlvenable
previously approved these changes
Sep 8, 2023
|
@graytaylor0 , We should probably have a unit test here as well. |
Signed-off-by: Taylor Gray <[email protected]>
dlvenable
approved these changes
Sep 11, 2023
oeyh
approved these changes
Sep 11, 2023
opensearch-trigger-bot bot
pushed a commit
that referenced
this pull request
Sep 12, 2023
Fix potential NPE in s3 scan partition supplier Signed-off-by: Taylor Gray <[email protected]> (cherry picked from commit f61338a)
dlvenable
pushed a commit
that referenced
this pull request
Sep 14, 2023
Fix potential NPE in s3 scan partition supplier Signed-off-by: Taylor Gray <[email protected]> (cherry picked from commit f61338a) Co-authored-by: Taylor Gray <[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.
Description
Fixes a potential NPE in the s3 scan partition supplier
Issues Resolved
Resolves #3316
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.