Author: markt
Date: Tue Oct 12 12:10:43 2010
New Revision: 1021753
URL: http://svn.apache.org/viewvc?rev=1021753&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50044 for NIO connector
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1021753&r1=1021752&r2=1021753&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Tue Oct
12 12:10:43 2010
@@ -647,7 +647,7 @@ public class Http11NioProcessor extends
//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;
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1021753&r1=1021752&r2=1021753&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Oct 12 12:10:43 2010
@@ -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
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
