Index: lams_common/src/java/org/lamsfoundation/lams/web/filter/LocaleFilter.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/web/filter/LocaleFilter.java,v
diff -u -r1.18 -r1.19
--- lams_common/src/java/org/lamsfoundation/lams/web/filter/LocaleFilter.java	11 Oct 2006 05:05:31 -0000	1.18
+++ lams_common/src/java/org/lamsfoundation/lams/web/filter/LocaleFilter.java	11 Oct 2006 05:36:33 -0000	1.19
@@ -87,8 +87,8 @@
     	//if request does not assign locale, then get it from database
     	if(preferredLocale == null){
 			HttpSession sharedsession = SessionManager.getSession(); 
-			UserDTO user = (UserDTO) sharedsession.getAttribute(AttributeNames.USER);
 			if(sharedsession != null){
+				UserDTO user = (UserDTO) sharedsession.getAttribute(AttributeNames.USER);
 				if(user != null){
 					direction = user.getDirection();
 					tz = user.getTimeZone();
@@ -131,7 +131,8 @@
             LocaleContextHolder.setLocale(preferredLocale);
         }
 
-        chain.doFilter(request, response);
+        if(chain != null)
+        	chain.doFilter(request, response);
         
         // Reset thread-bound LocaleContext.
         LocaleContextHolder.setLocaleContext(null);