Author: markt
Date: Mon Oct 19 14:40:35 2015
New Revision: 1709423
URL: http://svn.apache.org/viewvc?rev=1709423&view=rev
Log:
Revert r1701016 since it triggered unit test failures with reads not timing out
on Gump that were repeatable on at least OSX.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
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=1709423&r1=1709422&r2=1709423&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Mon Oct 19
14:40:35 2015
@@ -2440,10 +2440,8 @@ public class AprEndpoint extends Abstrac
// Set the current settings for this socket
setBlockingStatus(block);
if (block) {
- Socket.optSet(getSocket().longValue(),
Socket.APR_SO_NONBLOCK, 0);
Socket.timeoutSet(getSocket().longValue(),
getReadTimeout() * 1000);
} else {
- Socket.optSet(getSocket().longValue(),
Socket.APR_SO_NONBLOCK, 1);
Socket.timeoutSet(getSocket().longValue(), 0);
}
// Downgrade the lock
@@ -2561,10 +2559,8 @@ public class AprEndpoint extends Abstrac
// Set the current settings for this socket
setBlockingStatus(block);
if (block) {
- Socket.optSet(getSocket().longValue(),
Socket.APR_SO_NONBLOCK, 0);
Socket.timeoutSet(getSocket().longValue(),
getWriteTimeout() * 1000);
} else {
- Socket.optSet(getSocket().longValue(),
Socket.APR_SO_NONBLOCK, 1);
Socket.timeoutSet(getSocket().longValue(), 0);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
