From 542b88fb048e34ac4e7d0757ea2fb8ed9d55e27b Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@vmware.com>
Date: Thu, 9 Jul 2009 10:03:17 +0000
Subject: [PATCH] only call LocaleResolver when encountering an actual
 HttpServletRequest

---
 .../servlet/view/tiles2/SpringLocaleResolver.java   | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/tiles2/SpringLocaleResolver.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/tiles2/SpringLocaleResolver.java
index 86f0c3f18c..3bae928db5 100644
--- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/tiles2/SpringLocaleResolver.java
+++ b/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);
 	}
 
 }