Author: remy.maucherat(a)jboss.com Date: 2008-02-26 07:29:28 -0500 (Tue, 26 Feb 2008) New Revision: 447 Modified: trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Log: - Use soTimeout as the defaault if no timeout has been specified. Modified: trunk/java/org/apache/tomcat/util/net/AprEndpoint.java =================================================================== --- trunk/java/org/apache/tomcat/util/net/AprEndpoint.java 2008-02-25 21:42:23 UTC (rev 446) +++ trunk/java/org/apache/tomcat/util/net/AprEndpoint.java 2008-02-26 12:29:28 UTC (rev 447) @@ -1409,6 +1409,9 @@ * @param resume to send a callback event */ public void add(long socket, int timeout, boolean read, boolean write, boolean resume) { + if (timeout < 0) { + timeout = soTimeout; + } synchronized (this) { // Add socket to the list. Newly added sockets will wait // at most for pollTime before being polled