Author: markt
Date: Fri Dec 2 09:08:09 2016
New Revision: 1772318
URL: http://svn.apache.org/viewvc?rev=1772318&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60436
Avoid a potential NPE when processing async timeouts.
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java?rev=1772318&r1=1772317&r2=1772318&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java Fri Dec 2
09:08:09 2016
@@ -525,7 +525,10 @@ public abstract class AbstractProcessor
private void doTimeoutAsync() {
// Avoid multiple timeouts
setAsyncTimeout(-1);
- socketWrapper.processSocket(SocketEvent.TIMEOUT, true);
+ SocketWrapperBase<?> socketWrapper = getSocketWrapper();
+ if (socketWrapper != null) {
+ socketWrapper.processSocket(SocketEvent.TIMEOUT, true);
+ }
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1772318&r1=1772317&r2=1772318&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Dec 2 09:08:09 2016
@@ -190,6 +190,10 @@
any local port. This reduces the likelihood of the unlock failing.
(markt)
</fix>
+ <fix>
+ <bug>60436</bug>: Avoid a potential NPE when processing async timeouts.
+ (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
