Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50044 for NIO connector

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1021753 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/coyote/http11/Http11NioProcessor.java b/java/org/apache/coyote/http11/Http11NioProcessor.java
index aff7b31..a48ecf2 100644 (file)
--- a/java/org/apache/coyote/http11/Http11NioProcessor.java
+++ b/java/org/apache/coyote/http11/Http11NioProcessor.java
@@ -647,7 +647,7 @@ public class Http11NioProcessor extends AbstractHttp11Processor {
             //notify poller if not on a tomcat thread
             RequestInfo rp = request.getRequestProcessor();
             if ( rp.getStage() != org.apache.coyote.Constants.STAGE_SERVICE ) //async handling
-                socket.getPoller().cometInterest(socket);
+                socket.getPoller().add(socket);
         } else if (actionCode == ActionCode.COMET_SETTIMEOUT) {
             if (param==null) return;
             if (socket==null || socket.getAttachment(false)==null) return;

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 36cb935..bd5d347 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -134,9 +134,8 @@
         (kfujino) 
       </fix>
       <fix>
-        <bug>50044</bug>: Fix issue in APR/native connector when using comet
-        where socket remained in long poll after the comet request has ended.
-        (markt) 
+        <bug>50044</bug>: Fix issue when using comet where socket remained in
+        long poll after the comet request has ended. (markt) 
       </fix>
       <fix>
         <bug>50054</bug>: Correctly handle the setting of minSpareThreads in