[DS-493] Url in browser is incorrect after login

git-svn-id: http://scm.dspace.org/svn/repo/dspace/branches/dspace-1_6_x@4866 9c30dcfa-912a-0410-8fc2-9e0234be79fd

dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/utils/AuthenticationUtil.java

@@ -564,7 +564,11 @@ public class AuthenticationUtil
         	
         	// Return the path for which this request belongs too. Only urls
         	// for this path may be resumed.
-        	return interruptedRequest.getServletPath();
+        	if (interruptedRequest.getServletPath() == null || interruptedRequest.getServletPath().length() == 0) {
+                return interruptedRequest.getActualPath();
+            } else {
+        	    return interruptedRequest.getServletPath();
+            }
         }
         
         // No request was interrupted.

dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/utils/RequestInfo.java

@@ -117,6 +117,14 @@ public class RequestInfo
     {
     	return this.servletPath;
     }
+
+    /**
+     * Return the servlet path that this request is for.
+     */
+    public String getActualPath()
+    {
+    	return this.pathInfo + ((queryString == null || queryString.length() == 0) ? "" : "?"+queryString);
+    }
     
     /**
      * Wrap an incoming request to make it look like the request that the

dspace/CHANGES

@@ -18,6 +18,7 @@
 
 (Ben Bosman)
  - [DS-538] restricted items are being returned in OAI GetRecord method while using harvest.includerestricted.oai
+ - [DS-493] Url in browser is incorrect after login
 
 1.6.0 final
 ===========