Author: markt
Date: Thu May 28 08:06:37 2015
New Revision: 1682164
URL: http://svn.apache.org/r1682164
Log:
Pull up longPoll() to the base Protocol implementation
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.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=1682164&r1=1682163&r2=1682164&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Thu May 28
08:06:37 2015
@@ -831,8 +831,22 @@ public abstract class AbstractProtocol<S
}
protected abstract P createProcessor();
- protected abstract void longPoll(SocketWrapperBase<?> socket,
- Processor processor);
+
+
+ protected void longPoll(SocketWrapperBase<?> socket, Processor
processor) {
+ if (processor.isAsync()) {
+ // Async
+ socket.setAsync(true);
+ } else {
+ // This branch is currently only used with HTTP
+ // Either:
+ // - this is an upgraded connection
+ // - the request line/headers have not been completely
+ // read
+ socket.registerReadInterest();
+ }
+ }
+
/**
* Expected to be used by the handler once the processor is no longer
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java?rev=1682164&r1=1682163&r2=1682164&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java Thu May 28
08:06:37 2015
@@ -21,7 +21,6 @@ import java.nio.ByteBuffer;
import javax.servlet.http.HttpUpgradeHandler;
import org.apache.coyote.AbstractProtocol;
-import org.apache.coyote.Processor;
import org.apache.coyote.UpgradeProtocol;
import org.apache.tomcat.util.net.AbstractEndpoint;
import org.apache.tomcat.util.net.SSLHostConfig;
@@ -168,11 +167,6 @@ public abstract class AbstractAjpProtoco
return processor;
}
- @Override
- protected void longPoll(SocketWrapperBase<?> socket, Processor
processor) {
- // Same requirements for all AJP connectors
- socket.setAsync(true);
- }
@Override
protected AjpProcessor createUpgradeProcessor(SocketWrapperBase<?>
socket,
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1682164&r1=1682163&r2=1682164&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Thu
May 28 08:06:37 2015
@@ -627,20 +627,5 @@ public abstract class AbstractHttp11Prot
return new UpgradeProcessorExternal(socket, leftoverInput,
httpUpgradeHandler);
}
}
-
-
- @Override
- protected void longPoll(SocketWrapperBase<?> socket, Processor
processor) {
- if (processor.isAsync()) {
- // Async
- socket.setAsync(true);
- } else {
- // Either:
- // - this is an upgraded connection
- // - the request line/headers have not been completely
- // read
- socket.registerReadInterest();
- }
- }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
