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

[do-not-reply at jboss.org]

Author: julien_viet
Date: 2010-03-03 09:45:45 -0500 (Wed, 03 Mar 2010)
New Revision: 1942

Modified:
   portal/trunk/component/web/src/main/java/org/exoplatform/web/login/PortalLoginController.java
Log:
handle case were initialURI is null in portal login controller

Modified: portal/trunk/component/web/src/main/java/org/exoplatform/web/login/PortalLoginController.java
===================================================================
--- portal/trunk/component/web/src/main/java/org/exoplatform/web/login/PortalLoginController.java	2010-03-03 14:24:08 UTC (rev 1941)
+++ portal/trunk/component/web/src/main/java/org/exoplatform/web/login/PortalLoginController.java	2010-03-03 14:45:45 UTC (rev 1942)
@@ -54,7 +54,12 @@
       String uri = (String)req.getSession().getAttribute("initialURI");
       if (uri == null || uri.length() == 0)
       {
-         uri = req.getContextPath() + "/private" + req.getPathInfo();
+         String pathInfo = req.getPathInfo();
+         if (pathInfo == null)
+         {
+            pathInfo = "/";
+         }
+         uri = req.getContextPath() + "/private" + pathInfo;
       }
 
       //