From 2a5d1b086f514fe4ddf0d9e8a42d09416f93d36a Mon Sep 17 00:00:00 2001
From: Sebastien Deleuze <sdeleuze@pivotal.io>
Date: Thu, 26 Jan 2017 14:33:18 +0100
Subject: [PATCH] Fix Spring MVC ScriptTemplateView locale support

The locale should be set in resolveViewName() instead of
createView() in order to be taken in account with cached
views.

Issue: SPR-15064
---
 .../web/servlet/view/script/ScriptTemplateViewResolver.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/script/ScriptTemplateViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/script/ScriptTemplateViewResolver.java
index bbea2451dbb..652595a6a1e 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/script/ScriptTemplateViewResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/script/ScriptTemplateViewResolver.java
@@ -60,8 +60,8 @@ public class ScriptTemplateViewResolver extends UrlBasedViewResolver {
 	}
 
 	@Override
-	protected View createView(String viewName, Locale locale) throws Exception {
-		ScriptTemplateView view = (ScriptTemplateView)super.createView(viewName, locale);
+	public View resolveViewName(String viewName, Locale locale) throws Exception {
+		ScriptTemplateView view = (ScriptTemplateView)super.resolveViewName(viewName, locale);
 		view.setLocale(locale);
 		return view;
 	}