Pull up longPoll()

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

Hide file tree

Showing 6 changed files with 18 additions and 43 deletions.
diff --git a/java/org/apache/coyote/AbstractProtocol.java b/java/org/apache/coyote/AbstractProtocol.java
@@ -831,7 +831,7 @@ public SocketState process(SocketWrapperBase<S> wrapper,
         }
 
         protected abstract P createProcessor();
-        protected abstract void longPoll(SocketWrapperBase<S> socket,
+        protected abstract void longPoll(SocketWrapperBase<?> socket,
                 Processor processor);
 
         /**

diff --git a/java/org/apache/coyote/ajp/AbstractAjpProtocol.java b/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
@@ -169,7 +169,7 @@ protected AjpProcessor createProcessor() {
         }
 
         @Override
-        protected void longPoll(SocketWrapperBase<S> socket, Processor processor) {
+        protected void longPoll(SocketWrapperBase<?> socket, Processor processor) {
             // Same requirements for all AJP connectors
             socket.setAsync(true);
         }

diff --git a/java/org/apache/coyote/http11/AbstractHttp11Protocol.java b/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
@@ -37,6 +37,7 @@
 import org.apache.coyote.http11.upgrade.InternalHttpUpgradeHandler;
 import org.apache.coyote.http11.upgrade.UpgradeProcessorExternal;
 import org.apache.coyote.http11.upgrade.UpgradeProcessorInternal;
+//import org.apache.coyote.http2.Http2Protocol;
 import org.apache.tomcat.util.net.AbstractEndpoint;
 import org.apache.tomcat.util.net.SSLHostConfig;
 import org.apache.tomcat.util.net.SocketWrapperBase;
@@ -626,5 +627,20 @@ 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();
+            }
+        }
     }
 }
diff --git a/java/org/apache/coyote/http11/Http11AprProtocol.java b/java/org/apache/coyote/http11/Http11AprProtocol.java
@@ -104,19 +104,5 @@ public void release(SocketWrapperBase<Long> socket,
                 socket.registerReadInterest();
             }
         }
-
-        @Override
-        protected void longPoll(SocketWrapperBase<Long> 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();
-            }
-        }
     }
 }
diff --git a/java/org/apache/coyote/http11/Http11Nio2Protocol.java b/java/org/apache/coyote/http11/Http11Nio2Protocol.java
@@ -100,19 +100,6 @@ public void release(SocketWrapperBase<Nio2Channel> socket,
         }
 
 
-        @Override
-        protected void longPoll(SocketWrapperBase<Nio2Channel> socket, Processor processor) {
-            if (processor.isAsync()) {
-                socket.setAsync(true);
-            } else {
-                // Either:
-                //  - this is an upgraded connection
-                //  - the request line/headers have not been completely
-                //    read
-                socket.registerReadInterest();
-            }
-        }
-
         @Override
         public void closeAll() {
             for (Nio2Channel channel : connections.keySet()) {

diff --git a/java/org/apache/coyote/http11/Http11NioProtocol.java b/java/org/apache/coyote/http11/Http11NioProtocol.java
@@ -156,19 +156,5 @@ public void release(SocketWrapperBase<NioChannel> socket,
                 socket.registerReadInterest();
             }
         }
-
-        @Override
-        protected void longPoll(SocketWrapperBase<NioChannel> socket, Processor processor) {
-
-            if (processor.isAsync()) {
-                socket.setAsync(true);
-            } else {
-                // Either:
-                //  - this is an upgraded connection
-                //  - the request line/headers have not been completely
-                //    read
-                socket.registerReadInterest();
-            }
-        }
     }
 }