Author: markt
Date: Fri Jan 6 22:00:28 2017
New Revision: 1777722
URL: http://svn.apache.org/viewvc?rev=1777722&view=rev
Log:
Ensure UpgradeProcessor instances associated with closed connections are
removed from the map of current connections to Processors.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1777722&r1=1777721&r2=1777722&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Fri Jan 6
22:00:28 2017
@@ -631,7 +631,6 @@ public class AprEndpoint extends Abstrac
for (SocketWrapperBase<Long> socketWrapper : connections.values())
{
try {
socketWrapper.close();
- getHandler().release(socketWrapper);
} catch (IOException e) {
// Ignore
}
@@ -2413,6 +2412,7 @@ public class AprEndpoint extends Abstrac
@Override
public void close() {
+ getEndpoint().getHandler().release(this);
synchronized (closedLock) {
// APR typically crashes if the same socket is closed twice so
// make sure that doesn't happen.
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1777722&r1=1777721&r2=1777722&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Jan 6 22:00:28 2017
@@ -45,6 +45,14 @@
issues do not "pop up" wrt. others).
-->
<section name="Tomcat 9.0.0.M17 (markt)" rtext="in development">
+ <subsection name="Coyote">
+ <changelog>
+ <fix>
+ Ensure UpgradeProcessor instances associated with closed connections
are
+ removed from the map of current connections to Processors. (markt)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Jasper">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
