Author: thomas.heute(a)jboss.com Date: 2010-11-23 06:35:32 -0500 (Tue, 23 Nov 2010) New Revision: 5215 Modified: epp/portal/branches/EPP_5_1_Branch/component/web/security/src/main/java/org/exoplatform/web/login/InitiateLoginServlet.java Log: JBEPP-649: Login page doesn't redirect well Modified: epp/portal/branches/EPP_5_1_Branch/component/web/security/src/main/java/org/exoplatform/web/login/InitiateLoginServlet.java =================================================================== --- epp/portal/branches/EPP_5_1_Branch/component/web/security/src/main/java/org/exoplatform/web/login/InitiateLoginServlet.java 2010-11-23 10:42:20 UTC (rev 5214) +++ epp/portal/branches/EPP_5_1_Branch/component/web/security/src/main/java/org/exoplatform/web/login/InitiateLoginServlet.java 2010-11-23 11:35:32 UTC (rev 5215) @@ -129,6 +129,11 @@ } try { + String queryString = (String)req.getAttribute("javax.servlet.forward.query_string"); + if ((String)req.getAttribute("javax.servlet.forward.query_string") != null) + { + initialURI = initialURI + "?" + queryString; + } req.setAttribute("org.gatein.portal.login.initial_uri", initialURI); getServletContext().getRequestDispatcher("/login/jsp/login.jsp").include(req, resp); }