Skip to content

Avoid creating byte[] multiple times #35276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
+5 −8
Closed

Avoid creating byte[] multiple times #35276

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions spring-web/src/main/java/org/springframework/http/converter/StringHttpMessageConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,6 @@ protected String readInternal(Class<? extends String> clazz, HttpInputMessage in
return new String(bytes, charset);
}

@Override
protected Long getContentLength(String str, @Nullable MediaType contentType) {
Charset charset = getContentTypeCharset(contentType);
return (long) str.getBytes(charset).length;
}


@Override
protected void addDefaultHeaders(HttpHeaders headers, String s, @Nullable MediaType type) throws IOException {
if (headers.getContentType() == null ) {
Expand All @@ -125,7 +118,11 @@ protected void writeInternal(String str, HttpOutputMessage outputMessage) throws
headers.setAcceptCharset(getAcceptedCharsets());
}
Charset charset = getContentTypeCharset(headers.getContentType());
StreamUtils.copy(str, charset, outputMessage.getBody());
byte[] strBytes = str.getBytes(charset);
if (!headers.containsHeader(HttpHeaders.TRANSFER_ENCODING)) {
headers.setContentLength(strBytes.length);
}
StreamUtils.copy(strBytes, outputMessage.getBody());
}


Expand Down
Loading