From 7ff257c0ea00c02e453c8390c641835ebe778955 Mon Sep 17 00:00:00 2001
From: Sebastien Deleuze <sdeleuze@pivotal.io>
Date: Thu, 26 Jan 2017 15:29:55 +0100
Subject: [PATCH] Prevent NPE in ScriptTemplateView when no view is found

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

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;
 	}