Author: remm
Date: Thu Feb 12 16:10:31 2015
New Revision: 1659299
URL: http://svn.apache.org/r1659299
Log:
Guard against a NPE I see in the test CI logs.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java?rev=1659299&r1=1659298&r2=1659299&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java Thu Feb
12 16:10:31 2015
@@ -110,10 +110,13 @@ public class Http11Nio2Protocol extends
*/
@Override
public void release(SocketWrapperBase<Nio2Channel> socket) {
- Processor processor = connections.remove(socket.getSocket());
- if (processor != null) {
- processor.recycle();
- recycledProcessors.push(processor);
+ Nio2Channel channel = socket.getSocket();
+ if (channel != null) {
+ Processor processor = connections.remove(channel);
+ if (processor != null) {
+ processor.recycle();
+ recycledProcessors.push(processor);
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
