only call LocaleResolver when encountering an actual HttpServletRequest

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1499 50f2f4bb-b051-0410-bef5-90022cba6387

org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/tiles2/SpringLocaleResolver.java

@@ -44,16 +44,17 @@ public class SpringLocaleResolver extends DefaultLocaleResolver {
 
 	@Override
 	public Locale resolveLocale(TilesRequestContext context) {
-		if (context instanceof ServletTilesRequestContext) {
-			return RequestContextUtils.getLocale(((ServletTilesRequestContext) context).getRequest());
-		}
-		else if (context instanceof JspTilesRequestContext) {
+		if (context instanceof JspTilesRequestContext) {
 			PageContext pc = ((JspTilesRequestContext) context).getPageContext();
 			return RequestContextUtils.getLocale((HttpServletRequest) pc.getRequest());
 		}
-		else {
-			return super.resolveLocale(context);
+		else if (context instanceof ServletTilesRequestContext) {
+			HttpServletRequest request = ((ServletTilesRequestContext) context).getRequest();
+			if (request != null) {
+				return RequestContextUtils.getLocale(request);
+			}
 		}
+		return super.resolveLocale(context);
 	}
 
 }