Author: markt
Date: Thu Nov 21 15:34:27 2013
New Revision: 1544216
URL: http://svn.apache.org/r1544216
Log:
Protect against NPE.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1543897
Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1544216&r1=1544215&r2=1544216&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java Thu Nov
21 15:34:27 2013
@@ -557,8 +557,12 @@ public abstract class AbstractProtocol i
@SuppressWarnings("deprecation") // Old HTTP upgrade method has been
deprecated
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
