You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ju...@apache.org on 2010/04/27 17:27:55 UTC

svn commit: r938516 - /sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/FormAuthenticationHandler.java

Author: justin
Date: Tue Apr 27 15:27:54 2010
New Revision: 938516

URL: http://svn.apache.org/viewvc?rev=938516&view=rev
Log:
SLING-1498 - saving resource being requested

Modified:
    sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/FormAuthenticationHandler.java

Modified: sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/FormAuthenticationHandler.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/FormAuthenticationHandler.java?rev=938516&r1=938515&r2=938516&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/FormAuthenticationHandler.java (original)
+++ sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/FormAuthenticationHandler.java Tue Apr 27 15:27:54 2010
@@ -314,7 +314,11 @@ public class FormAuthenticationHandler i
 
         // append originally requested resource (for redirect after login)
         char parSep = '?';
-        final String resource = getLoginResource(request);
+        String resource = getLoginResource(request);
+        if (resource == null) {
+            resource = request.getContextPath() + request.getPathInfo();
+        }
+
         if (resource != null) {
             targetBuilder.append(parSep).append(Authenticator.LOGIN_RESOURCE);
             targetBuilder.append("=").append(