Author: thomas.heute(a)jboss.com Date: 2008-05-29 10:15:15 -0400 (Thu, 29 May 2008) New Revision: 10844 Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObjectResponseHandler.java Log: - Get the correct Locale from user's profile if available Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObjectResponseHandler.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObjectResponseHandler.java 2008-05-29 12:27:50 UTC (rev 10843) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObjectResponseHandler.java 2008-05-29 14:15:15 UTC (rev 10844) @@ -42,7 +42,14 @@ import org.jboss.portal.web.ServletContextDispatcher; import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletRequestWrapper; +import javax.servlet.http.HttpServletRequestWrapper; + import java.io.IOException; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.Locale; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -82,7 +89,21 @@ { public void sendResponse(ServerInvocationContext ctx) throws IOException, ServletException { - ServletContextDispatcher dispatcher = new ServletContextDispatcher(invocation.getServerContext().getClientRequest(), invocation.getServerContext().getClientResponse(), invocation.getRequest().getServer().getServletContainer()); + HttpServletRequestWrapper request = new HttpServletRequestWrapper(invocation.getServerContext().getClientRequest()) { + @Override + public Locale getLocale() + { + return invocation.getRequest().getLocale(); + } + + @Override + public Enumeration<Locale> getLocales() + { + return null; + } + + }; + ServletContextDispatcher dispatcher = new ServletContextDispatcher(request, invocation.getServerContext().getClientResponse(), invocation.getRequest().getServer().getServletContainer()); MarkupInfo markupInfo = (MarkupInfo)invocation.getResponse().getContentInfo(); rendition.render(markupInfo, dispatcher); }