svn commit: r1024397 - in /tomcat/trunk: java/org/apache/catalina/authenticator/FormAuthenticator.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Tue Oct 19 20:27:39 2010
New Revision: 1024397

URL: http://svn.apache.org/viewvc?rev=1024397&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49991
Ensure servlet request listeners are fired for the login and error pages during 
FORM authentication.

Modified:
    tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
    tomcat/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java?rev=1024397&r1=1024396&r2=1024397&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java 
Tue Oct 19 20:27:39 2010
@@ -327,7 +327,10 @@ public class FormAuthenticator
             context.getServletContext().getRequestDispatcher
             (config.getLoginPage());
         try {
-            disp.forward(request.getRequest(), response);
+            if (context.fireRequestInitEvent(request)) {
+                disp.forward(request.getRequest(), response);
+                context.fireRequestDestroyEvent(request);
+            }
         } catch (Throwable t) {
             ExceptionUtils.handleThrowable(t);
             String msg = sm.getString("formAuthenticator.forwardLoginFail");
@@ -357,7 +360,10 @@ public class FormAuthenticator
             context.getServletContext().getRequestDispatcher
             (config.getErrorPage());
         try {
-            disp.forward(request.getRequest(), response);
+            if (context.fireRequestInitEvent(request)) {
+                disp.forward(request.getRequest(), response);
+                context.fireRequestDestroyEvent(request);
+            }
         } catch (Throwable t) {
             ExceptionUtils.handleThrowable(t);
             String msg = sm.getString("formAuthenticator.forwardErrorFail");

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1024397&r1=1024396&r2=1024397&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Oct 19 20:27:39 2010
@@ -40,6 +40,10 @@
   <subsection name="Catalina">
     <changelog>
       <fix>
+        <bug>49991</bug>: Ensure servlet request listeners are fired for
+        the login and error pages during FORM authentication. (markt)
+      </fix>
+      <fix>
         <bug>50107</bug>: When removing a Host via JMX, do not attempt to
         destroy the host&apos;s pipeline twice. Patch provided by Eiji
         Takahashi. (markt)



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org