Author: markt
Date: Mon Sep 16 20:14:22 2013
New Revision: 1523788
URL: http://svn.apache.org/r1523788
Log:
Avoid possible NPE during shutdown.
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=1523788&r1=1523787&r2=1523788&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Mon Sep 16
20:14:22 2013
@@ -905,7 +905,10 @@ public class AprEndpoint extends Abstrac
// countDownConnection(). Once the connector is stopped, the latch is
// removed so it does not matter that destroySocket() does not call
// countDownConnection() in that case
- poller.removeFromPoller(socket);
+ Poller poller = this.poller;
+ if (poller != null) {
+ poller.removeFromPoller(socket);
+ }
connections.remove(Long.valueOf(socket));
destroySocket(socket, running);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
