Author: markt
Date: Wed Nov 20 18:29:43 2013
New Revision: 1543897
URL: http://svn.apache.org/r1543897
Log:
Protect against NPE.
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1543897&r1=1543896&r2=1543897&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Wed Nov 20
18:29:43 2013
@@ -590,8 +590,12 @@ public abstract class AbstractProtocol<S
public SocketState process(SocketWrapper<S> wrapper,
SocketStatus status) {
- S socket = wrapper.getSocket();
+ if (wrapper == null) {
+ // Nothing to do. Socket has been closed.
+ return SocketState.CLOSED;
+ }
+ S socket = wrapper.getSocket();
if (socket == null) {
// Nothing to do. Socket has been closed.
return SocketState.CLOSED;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
