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

Undo optimization from 12fe2c that can cause regression 

Closes gh-31327
This commit is contained in:
rstoyanchev 2023-09-29 17:15:23 +01:00
parent a2c5fed494
commit 23162bb306
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,11 +93,7 @@ public class StringHttpMessageConverter extends AbstractHttpMessageConverter<Str
@Override @Override
protected String readInternal(Class<? extends String> clazz, HttpInputMessage inputMessage) throws IOException { protected String readInternal(Class<? extends String> clazz, HttpInputMessage inputMessage) throws IOException {
Charset charset = getContentTypeCharset(inputMessage.getHeaders().getContentType()); Charset charset = getContentTypeCharset(inputMessage.getHeaders().getContentType());
long length = inputMessage.getHeaders().getContentLength(); return StreamUtils.copyToString(inputMessage.getBody(), charset);
byte[] bytes = (length >= 0 && length <= Integer.MAX_VALUE ?
inputMessage.getBody().readNBytes((int) length) :
inputMessage.getBody().readAllBytes());
return new String(bytes, charset);
} }
@Override @Override