diff --git a/spring-web/src/main/java/org/springframework/http/converter/StringHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/StringHttpMessageConverter.java index f3c7c5f978..33e915611d 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/StringHttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/StringHttpMessageConverter.java @@ -43,7 +43,7 @@ public class StringHttpMessageConverter extends AbstractHttpMessageConverter availableCharsets; + private volatile List availableCharsets; private boolean writeAcceptCharset = true; @@ -62,7 +62,6 @@ public class StringHttpMessageConverter extends AbstractHttpMessageConverter(Charset.availableCharsets().values()); } @@ -109,6 +108,10 @@ public class StringHttpMessageConverter extends AbstractHttpMessageConverter getAcceptedCharsets() { + if (this.availableCharsets == null) { + this.availableCharsets = new ArrayList<>( + Charset.availableCharsets().values()); + } return this.availableCharsets; }