Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use 'toString(Charset)' instead of 'toString(String)' for encodings (#27646)

Browse Source 
Co-authored-by: 홍성민(SungMin Hong)/Platform Engineering팀/11ST <devmonster@11stcorp.com>
This commit is contained in:
SungMin
2021-11-10 23:11:33 +09:00
committed by GitHub
parent 75036fa0ad
commit 32af39d6e6
12 changed files with 45 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java
View File

@@ -279,8 +279,11 @@ public class MockHttpServletResponse implements HttpServletResponse {
* @see #setContentType(String)
*/
public String getContentAsString(Charset fallbackCharset) throws UnsupportedEncodingException {
String charsetName = (this.characterEncodingSet ? getCharacterEncoding() : fallbackCharset.name());
return this.content.toString(charsetName);
if (this.characterEncodingSet) {
return this.content.toString(getCharacterEncoding());
}
return this.content.toString(fallbackCharset);
}
@Override