Author: remm
Date: Mon Apr 11 16:12:04 2016
New Revision: 1738597
URL: http://svn.apache.org/viewvc?rev=1738597&view=rev
Log:
59289: Avoid placing an updgraded processor in the recycle list
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1738597&r1=1738596&r2=1738597&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
Mon Apr 11 16:12:04 2016
@@ -197,7 +197,9 @@ public class Http11NioProtocol extends A
connections.remove(socket.getSocket());
if (processor != null) {
processor.recycle(true);
- recycledProcessors.offer(processor);
+ if (!processor.isUpgrade()) {
+ recycledProcessors.offer(processor);
+ }
}
}
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1738597&r1=1738596&r2=1738597&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Apr 11 16:12:04 2016
@@ -58,6 +58,14 @@
issues do not "pop up" wrt. others).
-->
<section name="Tomcat 7.0.70 (violetagg)">
+ <subsection name="Coyote">
+ <changelog>
+ <fix>
+ <bug>59289</bug>: Do not recycle upgrade processors in unexpected close
+ situations. (remm)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 7.0.69 (violetagg)">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
