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

Add @Nullable to setLocale in MockHttpServletResponse 

See gh-26493
This commit is contained in:
Sam Brannen 2021-07-29 14:47:31 +02:00
parent 96ee8a3bc7
commit 5b3f11c543
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -358,7 +358,10 @@ public class MockHttpServletResponse implements HttpServletResponse {
}
@Override
public void setLocale(Locale locale) {
public void setLocale(@Nullable Locale locale) {
// Although the Javadoc for javax.servlet.ServletResponse.setLocale(Locale) does not
// state how a null value for the supplied Locale should be handled, both Tomcat and
// Jetty simply ignore a null value. So we do the same here.
if (locale == null) {
return;
}

5
spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletResponse.java
View File

@ -358,7 +358,10 @@ public class MockHttpServletResponse implements HttpServletResponse {
}
@Override
public void setLocale(Locale locale) {
public void setLocale(@Nullable Locale locale) {
// Although the Javadoc for javax.servlet.ServletResponse.setLocale(Locale) does not
// state how a null value for the supplied Locale should be handled, both Tomcat and
// Jetty simply ignore a null value. So we do the same here.
if (locale == null) {
return;
}