From 546627456050b50fa14584b2b1c03a31ff89a133 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 19 Sep 2011 17:14:10 +0000
Subject: [PATCH] Don't add to Poller when socket is closing to prevent NPEs.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1172711 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/coyote/http11/Http11AprProtocol.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/coyote/http11/Http11AprProtocol.java b/java/org/apache/coyote/http11/Http11AprProtocol.java
index 7d1851c76..163c4a489 100644
--- a/java/org/apache/coyote/http11/Http11AprProtocol.java
+++ b/java/org/apache/coyote/http11/Http11AprProtocol.java
@@ -215,7 +215,7 @@ public class Http11AprProtocol extends AbstractHttp11Protocol {
                 boolean addToPoller) {
             processor.recycle();
             recycledProcessors.offer(processor);
-            if (addToPoller) {
+            if (addToPoller && proto.endpoint.isRunning()) {
                 ((AprEndpoint)proto.endpoint).getPoller().add(
                         socket.getSocket().longValue(), true);
             }
@@ -234,7 +234,7 @@ public class Http11AprProtocol extends AbstractHttp11Protocol {
 
             if (processor.isAsync()) {
                 socket.setAsync(true);
-            } else if (processor.comet) {
+            } else if (processor.comet && proto.endpoint.isRunning()) {
                 ((AprEndpoint) proto.endpoint).getCometPoller().add(
                         socket.getSocket().longValue(), false);
             }
-- 
2.11.0