You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2015/01/29 21:41:57 UTC
svn commit: r1655849 - in /tomcat/trunk/java/org/apache/coyote/http11:
AbstractHttp11Processor.java Http11Nio2Processor.java
Author: markt
Date: Thu Jan 29 20:41:57 2015
New Revision: 1655849
URL: http://svn.apache.org/r1655849
Log:
Simplify to align NIO2 with NIO and APR.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1655849&r1=1655848&r2=1655849&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Thu Jan 29 20:41:57 2015
@@ -1781,7 +1781,11 @@ public abstract class AbstractHttp11Proc
} else {
getInputBuffer().nextRequest();
getOutputBuffer().nextRequest();
- return SocketState.OPEN;
+ if (socketWrapper.isReadPending()) {
+ return SocketState.LONG;
+ } else {
+ return SocketState.OPEN;
+ }
}
}
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java?rev=1655849&r1=1655848&r2=1655849&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java Thu Jan 29 20:41:57 2015
@@ -25,12 +25,10 @@ import org.apache.coyote.http11.filters.
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.net.AbstractEndpoint;
-import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
import org.apache.tomcat.util.net.Nio2Channel;
import org.apache.tomcat.util.net.Nio2Endpoint;
import org.apache.tomcat.util.net.SSLSupport;
import org.apache.tomcat.util.net.SecureNio2Channel;
-import org.apache.tomcat.util.net.SocketStatus;
/**
@@ -54,21 +52,6 @@ public class Http11Nio2Processor extends
}
- // --------------------------------------------------------- Public Methods
-
- @Override
- public SocketState asyncDispatch(SocketStatus status) {
- SocketState state = super.asyncDispatch(status);
- if (state == SocketState.OPEN && socketWrapper.isReadPending()) {
- // Following async processing, a read is still pending, so
- // keep the processor associated
- return SocketState.LONG;
- } else {
- return state;
- }
- }
-
-
// ----------------------------------------------------- ActionHook Methods
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org