Add @nullable to setLocale in MockHttpServletResponse

See gh-26493
spring-projects · Jul 29, 2021 · 5b3f11c · 5b3f11c
1 parent 96ee8a3
commit 5b3f11c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java
@@ -358,7 +358,10 @@ public void reset() {
 	}
 
 	@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;
 		}

diff --git a/...estFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletResponse.java b/...estFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletResponse.java
@@ -358,7 +358,10 @@ public void reset() {
 	}
 
 	@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;
 		}