Author: markt
Date: Fri Nov 27 09:07:40 2015
New Revision: 1716807
URL: http://svn.apache.org/viewvc?rev=1716807&view=rev
Log:
Simplify
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProcessorLight.java
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProcessorLight.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProcessorLight.java?rev=1716807&r1=1716806&r2=1716807&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProcessorLight.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProcessorLight.java Fri Nov 27
09:07:40 2015
@@ -52,16 +52,14 @@ public abstract class AbstractProcessorL
state = dispatch(nextDispatch.getSocketStatus());
} else if (status == SocketStatus.DISCONNECT) {
// Do nothing here, just wait for it to get recycled
- } else if (isAsync() || isUpgrade()) {
- state = dispatch(status);
- } else if (state == SocketState.ASYNC_END) {
+ } else if (isAsync() || isUpgrade() || state ==
SocketState.ASYNC_END) {
state = dispatch(status);
if (state == SocketState.OPEN) {
- // There may be pipe-lined data to read. If the data
- // isn't processed now, execution will exit this
- // loop and call release() which will recycle the
- // processor (and input buffer) deleting any
- // pipe-lined data. To avoid this, process it now.
+ // There may be pipe-lined data to read. If the data isn't
+ // processed now, execution will exit this loop and call
+ // release() which will recycle the processor (and input
+ // buffer) deleting any pipe-lined data. To avoid this,
+ // process it now.
state = service(socketWrapper);
}
} else if (status == SocketStatus.OPEN_WRITE) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
