root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Defer Charset.availableCharsets() call 

Change the `StringHttpMessageConverter` to defer calling
Charset.availableCharsets() until absolutely necessary to help improve
startup times.

Issue: SPR-15502
This commit is contained in:
Phillip Webb 2017-05-01 21:26:16 -07:00 committed by Stephane Nicoll
parent 2390748fd7
commit 90477b40a4
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-web/src/main/java/org/springframework/http/converter/StringHttpMessageConverter.java
View File

@ -43,7 +43,7 @@ public class StringHttpMessageConverter extends AbstractHttpMessageConverter<Str
public static final Charset DEFAULT_CHARSET = StandardCharsets.ISO_8859_1;
private final List<Charset> availableCharsets;
private volatile List<Charset> availableCharsets;
private boolean writeAcceptCharset = true;
@ -62,7 +62,6 @@ public class StringHttpMessageConverter extends AbstractHttpMessageConverter<Str
*/
public StringHttpMessageConverter(Charset defaultCharset) {
super(defaultCharset, MediaType.TEXT_PLAIN, MediaType.ALL);
this.availableCharsets = new ArrayList<>(Charset.availableCharsets().values());
}
@ -109,6 +108,10 @@ public class StringHttpMessageConverter extends AbstractHttpMessageConverter<Str
* @return the list of accepted charsets
*/
protected List<Charset> getAcceptedCharsets() {
if (this.availableCharsets == null) {
this.availableCharsets = new ArrayList<>(
Charset.availableCharsets().values());
}
return this.availableCharsets;
}