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

Polish contribution 

See gh-30942
This commit is contained in:
Sam Brannen 2023-08-04 15:50:07 +03:00
parent 7636eecb48
commit c050642290
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2020 the original author or authors. * Copyright 2002-2023 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -94,12 +94,9 @@ public class StringHttpMessageConverter extends AbstractHttpMessageConverter<Str
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(); long length = inputMessage.getHeaders().getContentLength();
final byte[] bytes; byte[] bytes = (length >= 0 && length <= Integer.MAX_VALUE ?
if (length >= 0 && length <= Integer.MAX_VALUE) { inputMessage.getBody().readNBytes((int) length) :
bytes = inputMessage.getBody().readNBytes((int) length); inputMessage.getBody().readAllBytes());
} else {
bytes = inputMessage.getBody().readAllBytes();
}
return new String(bytes, charset); return new String(bytes, charset);
} }

2
spring-web/src/test/java/org/springframework/http/converter/StringHttpMessageConverterTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2022 the original author or authors. * Copyright 2002-2023 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.