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 652595a6a1..0df1a62f97 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 @@ -62,7 +62,9 @@ public class ScriptTemplateViewResolver extends UrlBasedViewResolver { @Override public View resolveViewName(String viewName, Locale locale) throws Exception { ScriptTemplateView view = (ScriptTemplateView)super.resolveViewName(viewName, locale); - view.setLocale(locale); + if (view != null) { + view.setLocale(locale); + } return view; }