You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2014/11/04 17:13:55 UTC
svn commit: r1636631 - in /tomcat/trunk/java/org/apache: coyote/http11/
tomcat/util/net/
Author: markt
Date: Tue Nov 4 16:13:55 2014
New Revision: 1636631
URL: http://svn.apache.org/r1636631
Log:
With removal of BIO, all endpoints support polling
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1636631&r1=1636630&r2=1636631&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Tue Nov 4 16:13:55 2014
@@ -973,11 +973,7 @@ public abstract class AbstractHttp11Proc
openSocket = false;
sendfileInProgress = false;
readComplete = true;
- if (endpoint.getUsePolling()) {
- keptAlive = false;
- } else {
- keptAlive = socketWrapper.isKeptAlive();
- }
+ keptAlive = false;
if (disableKeepAlive()) {
socketWrapper.setKeepAliveLeft(0);
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=1636631&r1=1636630&r2=1636631&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Tue Nov 4 16:13:55 2014
@@ -16,7 +16,6 @@
*/
package org.apache.coyote.http11;
-
import org.apache.coyote.AbstractProtocol;
public abstract class AbstractHttp11Protocol<S> extends AbstractProtocol<S> {
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1636631&r1=1636630&r2=1636631&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Tue Nov 4 16:13:55 2014
@@ -821,7 +821,6 @@ public abstract class AbstractEndpoint<S
// Some of these are always hard-coded, some are hard-coded to false (i.e.
// the endpoint does not support them) and some are configurable.
public abstract boolean getUseSendfile();
- public abstract boolean getUsePolling();
protected LimitLatch initializeConnectionLatch() {
if (maxConnections==-1) return null;
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1636631&r1=1636630&r2=1636631&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Tue Nov 4 16:13:55 2014
@@ -159,10 +159,6 @@ public class AprEndpoint extends Abstrac
public boolean getUseSendfile() { return useSendfile; }
- @Override
- public boolean getUsePolling() { return true; } // Always supported
-
-
/**
* Sendfile thread count.
*/
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=1636631&r1=1636630&r2=1636631&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Tue Nov 4 16:13:55 2014
@@ -151,9 +151,6 @@ public class Nio2Endpoint extends Abstra
public Handler getHandler() { return handler; }
- @Override
- public boolean getUsePolling() { return true; } // Always supported
-
public void setSocketProperties(SocketProperties socketProperties) {
this.socketProperties = socketProperties;
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1636631&r1=1636630&r2=1636631&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Tue Nov 4 16:13:55 2014
@@ -183,10 +183,6 @@ public class NioEndpoint extends Abstrac
public Handler getHandler() { return handler; }
- @Override
- public boolean getUsePolling() { return true; } // Always supported
-
-
/**
* Poller thread count.
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org