Author: markt
Date: Thu Aug 22 21:44:57 2013
New Revision: 1516626
URL: http://svn.apache.org/r1516626
Log:
Ensure destroy() method of upgrade handler is called
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1516626&r1=1516625&r2=1516626&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java Thu Aug
22 21:44:57 2013
@@ -676,8 +676,11 @@ public abstract class AbstractProtocol i
// Connection closed. OK to recycle the processor. Upgrade
// processors are not recycled.
connections.remove(socket);
- if (!(processor instanceof
org.apache.coyote.http11.upgrade.UpgradeProcessor)
- && !processor.isUpgrade()) {
+ if (processor.isUpgrade()) {
+ processor.getHttpUpgradeHandler().destroy();
+ } else if (processor instanceof
org.apache.coyote.http11.upgrade.UpgradeProcessor) {
+ // NO-OP
+ } else {
release(wrapper, processor, true, false);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
