Index: lams_common/src/java/org/lamsfoundation/lams/web/filter/LocaleFilter.java =================================================================== diff -u -r889a3994f9a2b92372cadd974984ef914867f235 -rf87d56ff7880160b8e0a6d899d02127b5170b13f --- lams_common/src/java/org/lamsfoundation/lams/web/filter/LocaleFilter.java (.../LocaleFilter.java) (revision 889a3994f9a2b92372cadd974984ef914867f235) +++ lams_common/src/java/org/lamsfoundation/lams/web/filter/LocaleFilter.java (.../LocaleFilter.java) (revision f87d56ff7880160b8e0a6d899d02127b5170b13f) @@ -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);