Author: markt
Date: Thu May 28 08:02:10 2015
New Revision: 1682163
URL: http://svn.apache.org/r1682163
Log:
Pull up longPoll()
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
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.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=1682163&r1=1682162&r2=1682163&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Thu May 28
08:02:10 2015
@@ -831,7 +831,7 @@ public abstract class AbstractProtocol<S
}
protected abstract P createProcessor();
- protected abstract void longPoll(SocketWrapperBase<S> socket,
+ protected abstract void longPoll(SocketWrapperBase<?> socket,
Processor processor);
/**
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=1682163&r1=1682162&r2=1682163&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:02:10 2015
@@ -169,7 +169,7 @@ public abstract class AbstractAjpProtoco
}
@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);
}
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=1682163&r1=1682162&r2=1682163&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:02:10 2015
@@ -37,6 +37,7 @@ import org.apache.coyote.UpgradeProtocol
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 @@ 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();
+ }
+ }
}
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1682163&r1=1682162&r2=1682163&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Thu May
28 08:02:10 2015
@@ -104,19 +104,5 @@ public class Http11AprProtocol extends A
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();
- }
- }
}
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java?rev=1682163&r1=1682162&r2=1682163&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java Thu May
28 08:02:10 2015
@@ -101,19 +101,6 @@ public class Http11Nio2Protocol extends
@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()) {
((Nio2Endpoint)
getProtocol().getEndpoint()).closeSocket(channel.getSocket());
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1682163&r1=1682162&r2=1682163&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Thu May
28 08:02:10 2015
@@ -156,19 +156,5 @@ public class Http11NioProtocol extends A
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();
- }
- }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
