Author: markt
Date: Wed May 27 13:43:27 2015
New Revision: 1682026
URL: http://svn.apache.org/r1682026
Log: (empty)
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
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=1682026&r1=1682025&r2=1682026&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java Wed May
27 13:43:27 2015
@@ -105,9 +105,6 @@ public class Http11Nio2Protocol extends
Processor processor, boolean addToPoller) {
processor.recycle();
recycledProcessors.push(processor);
- if (socket.isAsync()) {
- ((Nio2Endpoint)
getProtocol().getEndpoint()).removeTimeout(socket);
- }
// No need to add to poller. read() will have already been called
// with an appropriate completion handler.
}
@@ -117,7 +114,6 @@ public class Http11Nio2Protocol extends
protected void longPoll(SocketWrapperBase<Nio2Channel> socket,
Processor processor) {
if (processor.isAsync()) {
socket.setAsync(true);
- ((Nio2Endpoint)
getProtocol().getEndpoint()).addTimeout(socket);
} else {
// Either:
// - this is an upgraded connection
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1682026&r1=1682025&r2=1682026&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Wed May 27
13:43:27 2015
@@ -393,6 +393,7 @@ public class Nio2Endpoint extends Abstra
protected boolean processSocket0(SocketWrapperBase<Nio2Channel>
socketWrapper, SocketStatus status, boolean dispatch) {
try {
+ waitingRequests.remove(socketWrapper);
SocketProcessor sc = processorCache.pop();
if (sc == null) {
sc = new SocketProcessor(socketWrapper, status);
@@ -1554,14 +1555,6 @@ public class Nio2Endpoint extends Abstra
public void closeAll();
}
- public void addTimeout(SocketWrapperBase<Nio2Channel> socket) {
- waitingRequests.add(socket);
- }
-
- public boolean removeTimeout(SocketWrapperBase<Nio2Channel> socket) {
- return waitingRequests.remove(socket);
- }
-
public static void startInline() {
inlineCompletion.set(Boolean.TRUE);
}
@@ -1645,6 +1638,10 @@ public class Nio2Endpoint extends Abstra
if (running && !paused) {
nioChannels.push(socket.getSocket());
}
+ } else if (state == Handler.SocketState.LONG) {
+ if (socket.isAsync()) {
+ waitingRequests.add(socket);
+ }
} else if (state == SocketState.UPGRADING) {
socket.setKeptAlive(true);
launch = true;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
