spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-25 00:09:02 +00:00
Code Issues Projects Releases Wiki Activity

Prevent NPE in ScriptTemplateView when no view is found

Browse Source 
Issue: SPR-15064
This commit is contained in:
Sebastien Deleuze
2017-01-26 15:29:55 +01:00
parent 2a5d1b086f
commit 7ff257c0ea
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-webmvc/src/main/java/org/springframework/web/servlet/view/script/ScriptTemplateViewResolver.java
+3 -1
View File
@@ -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;
}