Author: aogburn Date: 2014-06-02 15:20:34 -0400 (Mon, 02 Jun 2014) New Revision: 2436 Modified: branches/7.3.x/src/main/java/org/apache/tomcat/util/net/NioEndpoint.java Log: [BZ-1097410] merge NIO EventPoller NPE fix Modified: branches/7.3.x/src/main/java/org/apache/tomcat/util/net/NioEndpoint.java =================================================================== --- branches/7.3.x/src/main/java/org/apache/tomcat/util/net/NioEndpoint.java 2014-06-02 15:36:05 UTC (rev 2435) +++ branches/7.3.x/src/main/java/org/apache/tomcat/util/net/NioEndpoint.java 2014-06-02 19:20:34 UTC (rev 2436) @@ -477,7 +477,7 @@ * successfully else <tt>false</tt> */ public boolean processChannel(NioChannel channel, SocketStatus status) { - if (channel.isClosed()) { + if (channel == null || channel.isClosed()) { return false; } try { Property changes on: branches/7.3.x/src/main/java/org/apache/tomcat/util/net/NioEndpoint.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/src/main/java/org/apache/tomcat/util/net/NioEndpoint.java:2407