Browse Source

Prevent NPE in ScriptTemplateView when no view is found

Issue: SPR-15064
pull/1307/head
Sebastien Deleuze 8 years ago
parent
commit
7ff257c0ea
  1. 4
      spring-webmvc/src/main/java/org/springframework/web/servlet/view/script/ScriptTemplateViewResolver.java

4
spring-webmvc/src/main/java/org/springframework/web/servlet/view/script/ScriptTemplateViewResolver.java

@ -62,7 +62,9 @@ public class ScriptTemplateViewResolver extends UrlBasedViewResolver { @@ -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;
}

Loading…
Cancel
Save