Author: remy.maucherat(a)jboss.com Date: 2012-08-29 03:51:24 -0400 (Wed, 29 Aug 2012) New Revision: 2071 Modified: trunk/src/main/java/org/apache/catalina/authenticator/FormAuthenticator.java Log: - Port fix of the fix for FORM: Save the decoded URI. Modified: trunk/src/main/java/org/apache/catalina/authenticator/FormAuthenticator.java =================================================================== --- trunk/src/main/java/org/apache/catalina/authenticator/FormAuthenticator.java 2012-08-28 13:22:31 UTC (rev 2070) +++ trunk/src/main/java/org/apache/catalina/authenticator/FormAuthenticator.java 2012-08-29 07:51:24 UTC (rev 2071) @@ -302,6 +302,7 @@ String uri = request.getContextPath() + landingPage; SavedRequest saved = new SavedRequest(); saved.setRequestURI(uri); + saved.setDecodedRequestURI(uri); request.getSessionInternal(true).setNote( Constants.FORM_REQUEST_NOTE, saved); response.sendRedirect(response.encodeRedirectURL(uri)); @@ -331,6 +332,7 @@ String uri = request.getContextPath() + landingPage; SavedRequest saved = new SavedRequest(); saved.setRequestURI(uri); + saved.setDecodedRequestURI(uri); session.setNote(Constants.FORM_REQUEST_NOTE, saved); response.sendRedirect(response.encodeRedirectURL(uri)); }