Skip to content

Commit ae1d15c

Browse files
committed
Declare protected getCharset method as non-static
See gh-25509
1 parent d616c66 commit ae1d15c

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

spring-web/src/main/java/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -286,14 +286,14 @@ private Object readJavaType(JavaType javaType, HttpInputMessage inputMessage) th
286286
}
287287

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

0 commit comments

Comments
 (0)