Author: markt Date: Thu Apr 9 10:20:36 2009 New Revision: 763585 URL: http://svn.apache.org/viewvc?rev=763585&view=rev Log: Java uses 0 rather than -1 for infinite socket timeout
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java Modified: tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java?rev=763585&r1=763584&r2=763585&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java Thu Apr 9 10:20:36 2009 @@ -253,7 +253,14 @@ * Socket timeout. */ public int getSoTimeout() { return socketProperties.getSoTimeout(); } - public void setSoTimeout(int soTimeout) { socketProperties.setSoTimeout(soTimeout); } + public void setSoTimeout(int soTimeout) { + // APR/native uses -1 for infinite - Java uses 0 + if (soTimeout == -1) { + socketProperties.setSoTimeout(0); + } else { + socketProperties.setSoTimeout(soTimeout); + } + } /** --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org