GitHub-Spring
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Restore calls to setLocale in MockHttpServletResponse 

Issue: SPR-17284
pull/1998/head
Rossen Stoyanchev 7 years ago
parent
6fe8cb949f
commit
d551710c32
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
Split 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

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

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

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

Write Preview
Loading…
Cancel
Save