liangqi
/
spring-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Restore calls to setLocale in MockHttpServletResponse

Browse Source 
Issue: SPR-17284
master
Rossen Stoyanchev 6 years ago
parent 9064ef59f9
commit 1489457025
2 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java
  2. 2
      spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletResponse.java

2
spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java
Unescape 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
Unescape 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)) {

Write Preview
Loading…
Cancel
Save