From b0e9be6d30206b9a7b462df858900ed529aba978 Mon Sep 17 00:00:00 2001 From: markt Date: Tue, 16 Aug 2011 15:52:19 +0000 Subject: [PATCH] Timeouts are ints git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1158335 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/coyote/http11/Http11AprProcessor.java | 2 +- java/org/apache/coyote/http11/Http11NioProcessor.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/java/org/apache/coyote/http11/Http11AprProcessor.java b/java/org/apache/coyote/http11/Http11AprProcessor.java index dd62aa38a..3b1918182 100644 --- a/java/org/apache/coyote/http11/Http11AprProcessor.java +++ b/java/org/apache/coyote/http11/Http11AprProcessor.java @@ -182,7 +182,7 @@ public class Http11AprProcessor extends AbstractHttp11Processor { keepAlive = true; comet = false; - long soTimeout = endpoint.getSoTimeout(); + int soTimeout = endpoint.getSoTimeout(); if (disableKeepAlive()) { socketWrapper.setKeepAliveLeft(0); diff --git a/java/org/apache/coyote/http11/Http11NioProcessor.java b/java/org/apache/coyote/http11/Http11NioProcessor.java index 564e2fba2..afdddfb60 100644 --- a/java/org/apache/coyote/http11/Http11NioProcessor.java +++ b/java/org/apache/coyote/http11/Http11NioProcessor.java @@ -211,7 +211,7 @@ public class Http11NioProcessor extends AbstractHttp11Processor { 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 AbstractHttp11Processor { // 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 -- 2.11.0