Author: markt
Date: Mon Sep 16 20:14:49 2013
New Revision: 1523789
URL: http://svn.apache.org/r1523789
Log:
Avoid possible NPE during shutdown.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1523788
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1523789&r1=1523788&r2=1523789&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Mon
Sep 16 20:14:49 2013
@@ -897,7 +897,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]
