Fix potential NPE when no source and no body #4932
Closed
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
In recent changes, we added missing support for `source` parameter in some REST APIs: * elastic#4892 : mget * elastic#4900 : mpercolate * elastic#4901 : msearch * elastic#4902 : mtermvectors * elastic#4903 : percolate ```java BytesReference content = null; if (request.hasContent()) { content = request.content(); } else { String source = request.param("source"); if (source != null) { content = new BytesArray(source); } } ``` It's definitely better to have: ```java BytesReference content = request.content(); if (!request.hasContent()) { String source = request.param("source"); if (source != null) { content = new BytesArray(source); } } ``` That said, it could be nice to have a single method to manage it for various REST actions. Closes elastic#4924.
| * @return rest content | ||
| */ | ||
| public static BytesReference getRestContent(RestRequest request) { | ||
| if (request == null) { |
There was a problem hiding this comment.
hmm when can this be null? sorry I looked at it earlier but the request should never be null no?
There was a problem hiding this comment.
Agree. I'm just paranoiac! :-)
There was a problem hiding this comment.
YEAH so I'd put an assert in there just for kicks
|
aside of the comment this LGTM and is good to go |
clintongormley
added
>bug
v0.90.11
v1.1.0
v2.0.0-beta1
v1.0.0.RC2
:Core/Infra/REST API
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.
In recent changes, we added missing support for
sourceparameter in some REST APIs:It's definitely better to have:
That said, it could be nice to have a single method to manage it for various REST actions.
Closes #4924.