You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2015/05/27 21:25:15 UTC
svn commit: r1682102 - in /tomcat/trunk/java/org/apache:
coyote/http11/Http11InputBuffer.java tomcat/util/net/Nio2Endpoint.java
tomcat/util/net/SocketWrapperBase.java
Author: remm
Date: Wed May 27 19:25:15 2015
New Revision: 1682102
URL: http://svn.apache.org/r1682102
Log:
Revert r1682087: likely unneeded.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java?rev=1682102&r1=1682101&r2=1682102&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java Wed May 27 19:25:15 2015
@@ -398,9 +398,6 @@ public class Http11InputBuffer implement
// Haven't read any request data yet so use the keep-alive
// timeout.
wrapper.setReadTimeout(wrapper.getEndpoint().getKeepAliveTimeout());
- if (!wrapper.isNonBlocking()) {
- return false;
- }
}
if (!fill(false)) {
// A read is pending, so no longer in initial state
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=1682102&r1=1682101&r2=1682102&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 19:25:15 2015
@@ -1316,11 +1316,6 @@ public class Nio2Endpoint extends Abstra
}
}
- @Override
- public boolean isNonBlocking() {
- return false;
- }
-
/*
* This should only be called from a thread that currently holds a lock
* on the socket. This prevents a race condition between a pending read
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java?rev=1682102&r1=1682101&r2=1682102&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java Wed May 27 19:25:15 2015
@@ -266,9 +266,6 @@ public abstract class SocketWrapperBase<
public SocketBufferHandler getSocketBufferHandler() { return socketBufferHandler; }
public abstract boolean isReadPending();
public abstract boolean isWritePending();
- public boolean isNonBlocking() {
- return true;
- }
public boolean hasDataToWrite() {
return !socketBufferHandler.isWriteBufferEmpty() || bufferedWrites.size() > 0;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org