Author: markt
Date: Thu Nov 16 20:01:12 2017
New Revision: 1815505
URL: http://svn.apache.org/viewvc?rev=1815505&view=rev
Log:
Avoid a possible NullPointerException when timing out AsyncContext instances
during shut down.
Modified:
tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java?rev=1815505&r1=1815504&r2=1815505&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java Thu Nov 16
20:01:12 2017
@@ -123,6 +123,8 @@ public class AsyncContextImpl implements
public boolean timeout() {
AtomicBoolean result = new AtomicBoolean();
request.getCoyoteRequest().action(ActionCode.ASYNC_TIMEOUT, result);
+ // Avoids NPEs during shutdown. A call to recycle will null this field.
+ Context context = this.context;
if (result.get()) {
ClassLoader oldCL = context.bind(false, null);
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1815505&r1=1815504&r2=1815505&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Nov 16 20:01:12 2017
@@ -78,6 +78,10 @@
<code>javax.security.auth.message.config.AuthConfigFactory</code> in
the
JASPIC API implementation. Based on a patch by Pavan Kumar. (markt)
</fix>
+ <fix>
+ Avoid a possible <code>NullPointerException</code> when timing out
+ <code>AsyncContext</code> instances during shut down. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
