Skip to content

Commit

Permalink
Declare protected getCharset method as non-static
Browse files Browse the repository at this point in the history
  • Loading branch information
jhoeller committed Sep 8, 2020
1 parent d616c66 commit ae1d15c
Showing 1 changed file with 3 additions and 3 deletions.
Expand Up @@ -286,14 +286,14 @@ private Object readJavaType(JavaType javaType, HttpInputMessage inputMessage) th
}

/**
* Return the charset to use for JSON input.
* Determine the charset to use for JSON input.
* <p>By default this is either the charset from the input {@code MediaType}
* or otherwise falling back on {@code UTF-8}.
* or otherwise falling back on {@code UTF-8}. Can be overridden in subclasses.
* @param contentType the content type of the HTTP input message
* @return the charset to use
* @since 5.1.18
*/
protected static Charset getCharset(@Nullable MediaType contentType) {
protected Charset getCharset(@Nullable MediaType contentType) {
if (contentType != null && contentType.getCharset() != null) {
return contentType.getCharset();
}
Expand Down

0 comments on commit ae1d15c

Please sign in to comment.