tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fha...@apache.org
Subject svn commit: r783489 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/coyote/http11/Http11NioProtocol.java
Date Wed, 10 Jun 2009 20:20:17 GMT
Author: fhanik
Date: Wed Jun 10 20:20:17 2009
New Revision: 783489

URL: http://svn.apache.org/viewvc?rev=783489&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47237
Dont associate a processor with a socket while in keep alive, its inefficient

Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=783489&r1=783488&r2=783489&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jun 10 20:20:17 2009
@@ -130,11 +130,6 @@
   +1: markt, funkman, kkolinko
   -1:
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47237
-  http://svn.apache.org/viewvc?rev=783155&view=rev
-  +1: fhanik, funkman, markt
-  -1: 
-
 * Add Executor JMX stats
    http://svn.apache.org/viewvc?rev=783474&view=rev
   +1: fhanik

Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=783489&r1=783488&r2=783489&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Wed Jun 10 20:20:17
2009
@@ -730,6 +730,8 @@
                         NioEndpoint.KeyAttachment att = (NioEndpoint.KeyAttachment)socket.getAttachment(false);
                         socket.getPoller().add(socket,att.getCometOps());
                     } else {
+                    	//we should not hold on to the processor objects
+                    	release(socket);
                         socket.getPoller().add(socket);
                     }
                 } else {



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message