Pull up longPoll() to the base Protocol implementation

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1682164 13f79535-47bb-0310-9956-ffa450edef68
apache · May 28, 2015 · 0598f7e · 0598f7e
1 parent d7d7c11
commit 0598f7e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 23 deletions.
diff --git a/java/org/apache/coyote/AbstractProtocol.java b/java/org/apache/coyote/AbstractProtocol.java
@@ -831,8 +831,22 @@ public SocketState process(SocketWrapperBase<S> wrapper,
         }
 
         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

diff --git a/java/org/apache/coyote/ajp/AbstractAjpProtocol.java b/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
@@ -21,7 +21,6 @@
 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 @@ protected AjpProcessor createProcessor() {
             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,

diff --git a/java/org/apache/coyote/http11/AbstractHttp11Protocol.java b/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
@@ -627,20 +627,5 @@ protected Processor createUpgradeProcessor(
                 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();
-            }
-        }
     }
 }