Ensure request and response facades are used when firing application listeners.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc8.5.x/trunk@1785775 13f79535-47bb-0310-9956-ffa450edef68

Author: markt-asf

java/org/apache/catalina/authenticator/FormAuthenticator.java

@@ -427,9 +427,9 @@ protected void forwardToLoginPage(Request request,
         RequestDispatcher disp =
             context.getServletContext().getRequestDispatcher(loginPage);
         try {
-            if (context.fireRequestInitEvent(request)) {
+            if (context.fireRequestInitEvent(request.getRequest())) {
                 disp.forward(request.getRequest(), response);
-                context.fireRequestDestroyEvent(request);
+                context.fireRequestDestroyEvent(request.getRequest());
             }
         } catch (Throwable t) {
             ExceptionUtils.handleThrowable(t);
@@ -471,12 +471,11 @@ protected void forwardToErrorPage(Request request,
         }
 
         RequestDispatcher disp =
-            context.getServletContext().getRequestDispatcher
-            (config.getErrorPage());
+                context.getServletContext().getRequestDispatcher(config.getErrorPage());
         try {
-            if (context.fireRequestInitEvent(request)) {
+            if (context.fireRequestInitEvent(request.getRequest())) {
                 disp.forward(request.getRequest(), response);
-                context.fireRequestDestroyEvent(request);
+                context.fireRequestDestroyEvent(request.getRequest());
             }
         } catch (Throwable t) {
             ExceptionUtils.handleThrowable(t);

java/org/apache/catalina/core/AsyncContextImpl.java

@@ -112,7 +112,7 @@ public void fireOnComplete() {
                 }
             }
         } finally {
-            context.fireRequestDestroyEvent(request);
+            context.fireRequestDestroyEvent(request.getRequest());
             clearServletRequestResponse();
             context.unbind(Globals.IS_SECURITY_ENABLED, oldCL);
         }

java/org/apache/catalina/core/StandardHostValve.java

@@ -123,7 +123,7 @@ public final void invoke(Request request, Response response)
         try {
             context.bind(Globals.IS_SECURITY_ENABLED, MY_CLASSLOADER);
 
-            if (!asyncAtStart && !context.fireRequestInitEvent(request)) {
+            if (!asyncAtStart && !context.fireRequestInitEvent(request.getRequest())) {
                 // Don't fire listeners during async processing (the listener
                 // fired for the request that called startAsync()).
                 // If a request init listener throws an exception, the request
@@ -179,7 +179,7 @@ public final void invoke(Request request, Response response)
             }
 
             if (!request.isAsync() && !asyncAtStart) {
-                context.fireRequestDestroyEvent(request);
+                context.fireRequestDestroyEvent(request.getRequest());
             }
         } finally {
             // Access a session (if present) to update last accessed time, based

webapps/docs/changelog.xml

@@ -157,6 +157,10 @@
         session - if there is a session - when running under a
         <code>SecurityManager</code>. Patch provided by Jan Engehausen. (markt)
       </fix>
+      <fix>
+        Ensure request and response facades are used when firing application
+        listeners. (markt/remm)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">