Author: markt
Date: Wed Aug 6 12:27:43 2014
New Revision: 1616204
URL: http://svn.apache.org/r1616204
Log:
Avoid possible NPE (unlikely but observed while stepping through code
investogating BZ 56739)
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1616204&r1=1616203&r2=1616204&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Wed
Aug 6 12:27:43 2014
@@ -898,7 +898,10 @@ public abstract class AbstractHttp11Proc
break;
}
case DISPATCH_EXECUTE: {
- getEndpoint().executeNonBlockingDispatches(socketWrapper);
+ SocketWrapper<S> wrapper = socketWrapper;
+ if (wrapper != null) {
+ getEndpoint().executeNonBlockingDispatches(wrapper);
+ }
break;
}
case CLOSE_NOW: {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
