Author: markt
Date: Thu Aug 22 10:20:38 2013
New Revision: 1516410
URL: http://svn.apache.org/r1516410
Log:
Fix some NPEs observed while investigating some unit test failures.
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:r1475900
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=1516410&r1=1516409&r2=1516410&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 Aug
22 10:20:38 2013
@@ -558,11 +558,16 @@ public abstract class AbstractProtocol i
public SocketState process(SocketWrapper<S> wrapper,
SocketStatus status) {
S socket = wrapper.getSocket();
- Processor<S> processor = connections.get(socket);
+ if (socket == null) {
+ // Nothing to do. Socket has been closed.
+ return SocketState.CLOSED;
+ }
+
+ Processor<S> processor = connections.get(socket);
if (status == SocketStatus.DISCONNECT && processor == null) {
- //nothing more to be done endpoint requested a close
- //and there are no object associated with this connection
+ // Nothing to do. Endpoint requested a close and there is no
+ // longer a processor associated with this socket.
return SocketState.CLOSED;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
