You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@hc.apache.org by ol...@apache.org on 2011/08/04 21:34:29 UTC

svn commit: r1153976 - /httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/AbstractHttpClientConnection.java

Author: olegk
Date: Thu Aug  4 19:34:28 2011
New Revision: 1153976

URL: http://svn.apache.org/viewvc?rev=1153976&view=rev
Log:
Fixed incorrect handling of socket timeouts in AbstractHttpClientConnection#isStale()

Modified:
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/AbstractHttpClientConnection.java

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/AbstractHttpClientConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/AbstractHttpClientConnection.java?rev=1153976&r1=1153975&r2=1153976&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/AbstractHttpClientConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/AbstractHttpClientConnection.java Thu Aug  4 19:34:28 2011
@@ -28,6 +28,7 @@
 package org.apache.http.impl;
 
 import java.io.IOException;
+import java.net.SocketTimeoutException;
 
 import org.apache.http.HttpClientConnection;
 import org.apache.http.HttpConnectionMetrics;
@@ -311,6 +312,8 @@ public abstract class AbstractHttpClient
         try {
             this.inbuffer.isDataAvailable(1);
             return isEof();
+        } catch (SocketTimeoutException ex) {
+            return false;
         } catch (IOException ex) {
             return true;
         }