Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51494

Prevent an NPE when a long running request completes if the associated web application was destroyed while the request was processing

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

diff --git a/java/org/apache/catalina/core/StandardContextValve.java b/java/org/apache/catalina/core/StandardContextValve.java
index 934bad0..bdaa792 100644 (file)
--- a/java/org/apache/catalina/core/StandardContextValve.java
+++ b/java/org/apache/catalina/core/StandardContextValve.java
@@ -180,7 +180,12 @@ final class StandardContextValve
             // place
             if (!(request.isAsync() || (asyncAtStart && request.getAttribute(
                         RequestDispatcher.ERROR_EXCEPTION) != null))) {
-                context.fireRequestDestroyEvent(request);
+                // Protect against NPEs if context was destroyed during a long
+                // running request.
+                StandardContext c = context;
+                if (c != null && c.getState().isAvailable()) {
+                    context.fireRequestDestroyEvent(request);
+                }
             }
         }
     }

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 9e9a976..14c653f 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -62,6 +62,11 @@
       <fix>
         Fix regression in year number formatting for AccessLogValve. (rjung)
       </fix>
+      <fix>
+        <bug>51494</bug>: Prevent an NPE when a long running request completes
+        if the associated web application was destroyed while the request was
+        processing. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">