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

Restore calls to setLocale in MockHttpServletResponse 

Issue: SPR-17284
This commit is contained in:
Rossen Stoyanchev 2018-10-05 13:50:41 -04:00
parent 9064ef59f9
commit 1489457025
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -600,7 +600,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
HttpHeaders headers = new HttpHeaders(); HttpHeaders headers = new HttpHeaders();
headers.add(HttpHeaders.CONTENT_LANGUAGE, value.toString()); headers.add(HttpHeaders.CONTENT_LANGUAGE, value.toString());
Locale language = headers.getContentLanguage(); Locale language = headers.getContentLanguage();
this.locale = language != null ? language : Locale.getDefault(); setLocale(language != null ? language : Locale.getDefault());
return true; return true;
} }
else if (HttpHeaders.SET_COOKIE.equalsIgnoreCase(name)) { else if (HttpHeaders.SET_COOKIE.equalsIgnoreCase(name)) {

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

@ -600,7 +600,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
HttpHeaders headers = new HttpHeaders(); HttpHeaders headers = new HttpHeaders();
headers.add(HttpHeaders.CONTENT_LANGUAGE, value.toString()); headers.add(HttpHeaders.CONTENT_LANGUAGE, value.toString());
Locale language = headers.getContentLanguage(); Locale language = headers.getContentLanguage();
this.locale = language != null ? language : Locale.getDefault(); setLocale(language != null ? language : Locale.getDefault());
return true; return true;
} }
else if (HttpHeaders.SET_COOKIE.equalsIgnoreCase(name)) { else if (HttpHeaders.SET_COOKIE.equalsIgnoreCase(name)) {