commit 011c6456105a9fc35052043c7aedc3a9814a13e6
author Mark Thomas <markt@apache.org> Mon Jun 26 15:53:15 2017 +0000
committer Mark Thomas <markt@apache.org> Mon Jun 26 15:53:15 2017 +0000
tree 0fc613407477332116595b35aaec7f72240ab214
parent ff95c6e45429ffa6c98977de5b7441037b6803e5

Avoid NPE during non-container thread error handling

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

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

diff --git a/java/org/apache/catalina/core/AsyncContextImpl.java b/java/org/apache/catalina/core/AsyncContextImpl.java
index 52fc7eb..82a3767 100644
--- a/java/org/apache/catalina/core/AsyncContextImpl.java
+++ b/java/org/apache/catalina/core/AsyncContextImpl.java
@@ -431,6 +431,10 @@
         if (result.get()) {
             // No listener called dispatch() or complete(). This is an error.
             // SRV.2.3.3.3 (search for "error dispatch")
+            // Take a local copy to avoid threading issues if another thread
+            // clears this (can happen during error handling with non-container
+            // threads)
+            ServletResponse servletResponse = this.servletResponse;
             if (servletResponse instanceof HttpServletResponse) {
                 ((HttpServletResponse) servletResponse).setStatus(
                         HttpServletResponse.SC_INTERNAL_SERVER_ERROR);