From: markt Date: Tue, 12 Oct 2010 12:10:43 +0000 (+0000) Subject: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50044 for NIO connector X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=e78c8af18debab5f7c53b18c4747b8261d1621b3;p=tomcat7.0 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 aff7b3101..a48ecf243 100644 --- 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 36cb9351c..bd5d34749 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -134,9 +134,8 @@ (kfujino) - 50044: Fix issue in APR/native connector when using comet - where socket remained in long poll after the comet request has ended. - (markt) + 50044: Fix issue when using comet where socket remained in + long poll after the comet request has ended. (markt) 50054: Correctly handle the setting of minSpareThreads in