Author: markt
Date: Mon Feb 20 13:58:42 2012
New Revision: 1291261
URL: http://svn.apache.org/viewvc?rev=1291261&view=rev
Log:
Fix problem observed running Autobahn WebSocket test suite. If an error
occurs, an UpgradeProcessor could be added to the HttpProcessor pool
leading to the failure of the subsequent request.
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1291261&r1=1291260&r2=1291261&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Mon Feb 20
13:58:42 2012
@@ -30,6 +30,7 @@ import javax.management.MalformedObjectN
import javax.management.ObjectName;
import org.apache.coyote.http11.upgrade.UpgradeInbound;
+import org.apache.coyote.http11.upgrade.UpgradeProcessor;
import org.apache.juli.logging.Log;
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.modeler.Registry;
@@ -614,7 +615,10 @@ public abstract class AbstractProtocol i
// less-than-verbose logs.
getLog().error(sm.getString("ajpprotocol.proto.error"), e);
}
- release(socket, processor, true, false);
+ // Don't try to add upgrade processors back into the pool
+ if (!(processor instanceof UpgradeProcessor)) {
+ release(socket, processor, true, false);
+ }
return SocketState.CLOSED;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
