Author: markt
Date: Tue Aug 16 15:52:19 2011
New Revision: 1158335
URL: http://svn.apache.org/viewvc?rev=1158335&view=rev
Log:
Timeouts are ints
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1158335&r1=1158334&r2=1158335&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Tue Aug
16 15:52:19 2011
@@ -182,7 +182,7 @@ public class Http11AprProcessor extends
keepAlive = true;
comet = false;
- long soTimeout = endpoint.getSoTimeout();
+ int soTimeout = endpoint.getSoTimeout();
if (disableKeepAlive()) {
socketWrapper.setKeepAliveLeft(0);
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1158335&r1=1158334&r2=1158335&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Tue Aug
16 15:52:19 2011
@@ -211,7 +211,7 @@ public class Http11NioProcessor extends
keepAlive = true;
comet = false;
- long soTimeout = endpoint.getSoTimeout();
+ int soTimeout = endpoint.getSoTimeout();
if (disableKeepAlive()) {
socketWrapper.setKeepAliveLeft(0);
@@ -227,7 +227,7 @@ public class Http11NioProcessor extends
// Parsing the request header
try {
if( !disableUploadTimeout && keptAlive && soTimeout > 0 ) {
-
socketWrapper.getSocket().getIOChannel().socket().setSoTimeout((int)soTimeout);
+
socketWrapper.getSocket().getIOChannel().socket().setSoTimeout(soTimeout);
}
if (!inputBuffer.parseRequestLine(keptAlive)) {
// Haven't finished reading the request so keep the socket
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
