Restore calls to setLocale in MockHttpServletResponse

rstoyanchev · rstoyanchev · commit d551710c32e2 · 2018-10-05T13:53:19.000-04:00
Issue: SPR-17284
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
@@ -593,7 +593,7 @@ else if (HttpHeaders.CONTENT_LANGUAGE.equalsIgnoreCase(name)) {
 			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 {
diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletResponse.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletResponse.java
@@ -581,7 +581,7 @@ else if (HttpHeaders.CONTENT_LANGUAGE.equalsIgnoreCase(name)) {
 			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 {

Original file line number	Diff line number	Diff line change
`@@ -593,7 +593,7 @@ else if (HttpHeaders.CONTENT_LANGUAGE.equalsIgnoreCase(name)) {`
`593`	`593`	`HttpHeaders headers = new HttpHeaders();`
`594`	`594`	`headers.add(HttpHeaders.CONTENT_LANGUAGE, value.toString());`
`595`	`595`	`Locale language = headers.getContentLanguage();`
`596`		`- this.locale = language != null ? language : Locale.getDefault();`
	`596`	`+ setLocale(language != null ? language : Locale.getDefault());`
`597`	`597`	`return true;`
`598`	`598`	`}`
`599`	`599`	`else {`
Original file line number	Diff line number	Diff line change
`@@ -581,7 +581,7 @@ else if (HttpHeaders.CONTENT_LANGUAGE.equalsIgnoreCase(name)) {`
`581`	`581`	`HttpHeaders headers = new HttpHeaders();`
`582`	`582`	`headers.add(HttpHeaders.CONTENT_LANGUAGE, value.toString());`
`583`	`583`	`Locale language = headers.getContentLanguage();`
`584`		`- this.locale = language != null ? language : Locale.getDefault();`
	`584`	`+ setLocale(language != null ? language : Locale.getDefault());`
`585`	`585`	`return true;`
`586`	`586`	`}`
`587`	`587`	`else {`