Author: markt
Date: Wed Oct 17 09:27:01 2012
New Revision: 1399161
URL: http://svn.apache.org/viewvc?rev=1399161&view=rev
Log:
Reduce a circular package dependency (Structure 101)
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=1399161&r1=1399160&r2=1399161&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Wed Oct 17
09:27:01 2012
@@ -31,7 +31,6 @@ 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.collections.SynchronizedStack;
@@ -651,8 +650,9 @@ public abstract class AbstractProtocol i
// Need to keep the connection associated with the
processor
longPoll(socket, processor);
} else {
- // Connection closed. OK to recycle the processor.
- if (!(processor instanceof UpgradeProcessor)) {
+ // Connection closed. OK to recycle the processor. Upgrade
+ // processors are not recycled.
+ if (!processor.isUpgrade()) {
release(socket, processor, true, false);
}
}
@@ -678,7 +678,7 @@ public abstract class AbstractProtocol i
sm.getString("abstractConnectionHandler.error"), e);
}
// Don't try to add upgrade processors back into the pool
- if (!(processor instanceof UpgradeProcessor)) {
+ if (!processor.isUpgrade()) {
release(socket, processor, true, false);
}
return SocketState.CLOSED;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
