Author: kkolinko
Date: Thu Jan 20 21:28:11 2011
New Revision: 1061524
URL: http://svn.apache.org/viewvc?rev=1061524&view=rev
Log:
Additional patch (not important) for r1061421
Use the new release(s,p) method added in r1061421
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=1061524&r1=1061523&r2=1061524&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 20 21:28:11 2011
@@ -108,12 +108,6 @@ PATCHES PROPOSED TO BACKPORT:
sufficient
-1:
-* Fix very large memory leak in NIO connector
- Additional patch (not important):
- http://svn.apache.org/viewvc?rev=1061397&view=rev
- +1: kkolinko, markt, fhanik
- -1:
-
* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=50606
Improve CGIServlet. Provide support for specifying empty value for the
executable init-param. Provide support for explicit additional arguments
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=1061524&r1=1061523&r2=1061524&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
Thu Jan 20 21:28:11 2011
@@ -773,9 +773,7 @@ public class Http11NioProtocol implement
Http11NioProtocol.log.error
(sm.getString("http11protocol.proto.error"), e);
}
- connections.remove(socket);
- processor.recycle();
- recycledProcessors.offer(processor);
+ release(socket, processor);
return SocketState.CLOSED;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
