Author: markt
Date: Thu May 23 20:50:05 2013
New Revision: 1485847
URL: http://svn.apache.org/r1485847
Log:
Add some NPE protection
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1485847&r1=1485846&r2=1485847&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Thu May 23
20:50:05 2013
@@ -1600,9 +1600,12 @@ public class AprEndpoint extends Abstrac
info.socket);
}
timeouts.remove(info.socket);
+ AprSocketWrapper wrapper = connections.get(
+ Long.valueOf(info.socket));
+ if (wrapper == null) {
+ continue;
+ }
if (info.read() || info.write()) {
- AprSocketWrapper wrapper = connections.get(
- Long.valueOf(info.socket));
boolean comet = wrapper.isComet();
if (comet || wrapper.pollerFlags != 0) {
removeFromPoller(info.socket);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
