Author: remy.maucherat(a)jboss.com Date: 2014-02-14 08:12:02 -0500 (Fri, 14 Feb 2014) New Revision: 2365 Modified: branches/7.4.x/src/main/java/org/apache/tomcat/util/net/NioEndpoint.java Log: Guard against NPE here (java.io avoids NPEs in that situation). Modified: branches/7.4.x/src/main/java/org/apache/tomcat/util/net/NioEndpoint.java =================================================================== --- branches/7.4.x/src/main/java/org/apache/tomcat/util/net/NioEndpoint.java 2014-02-11 14:47:00 UTC (rev 2364) +++ branches/7.4.x/src/main/java/org/apache/tomcat/util/net/NioEndpoint.java 2014-02-14 13:12:02 UTC (rev 2365) @@ -1108,6 +1108,9 @@ if (this.channelList.size() > this.size) { return false; } + if (channel == null) { + return false; + } long date = timeout + System.currentTimeMillis(); ChannelInfo info = this.channelList.get(channel.getId());