[gatein-commits] gatein SVN: r2146 - portal/trunk/component/web/src/main/java/org/exoplatform/web/login.

[do-not-reply at jboss.org]

Author: julien_viet
Date: 2010-03-11 03:57:03 -0500 (Thu, 11 Mar 2010)
New Revision: 2146

Modified:
   portal/trunk/component/web/src/main/java/org/exoplatform/web/login/InitiateLoginServlet.java
Log:
GTNPORTAL-854
GTNPORTAL-864


Modified: portal/trunk/component/web/src/main/java/org/exoplatform/web/login/InitiateLoginServlet.java
===================================================================
--- portal/trunk/component/web/src/main/java/org/exoplatform/web/login/InitiateLoginServlet.java	2010-03-11 06:31:20 UTC (rev 2145)
+++ portal/trunk/component/web/src/main/java/org/exoplatform/web/login/InitiateLoginServlet.java	2010-03-11 08:57:03 UTC (rev 2146)
@@ -122,9 +122,14 @@
 
    private void showLoginForm(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
    {
+      String initialURI = (String)req.getAttribute("javax.servlet.forward.request_uri");
+      if (initialURI == null)
+      {
+         throw new IllegalStateException("request attribute javax.servlet.forward.request_uri should not be null here");
+      }
       try
       {
-         req.setAttribute("org.gatein.portal.login.initial_uri", "javax.servlet.forward.request_uri");
+         req.setAttribute("org.gatein.portal.login.initial_uri", initialURI);
          getServletContext().getRequestDispatcher("/login/jsp/login.jsp").include(req, resp);
       }
       finally