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 2013/06/11 15:15:44 UTC
svn commit: r1491786 - in
/httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/conn:
ConnectTimeoutException.java scheme/PlainSocketFactory.java
ssl/SSLSocketFactory.java
Author: olegk
Date: Tue Jun 11 13:15:43 2013
New Revision: 1491786
URL: http://svn.apache.org/r1491786
Log:
ConnectTimeoutException to chain the cause exception
Modified:
httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/conn/ConnectTimeoutException.java
httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/conn/scheme/PlainSocketFactory.java
httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java
Modified: httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/conn/ConnectTimeoutException.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/conn/ConnectTimeoutException.java?rev=1491786&r1=1491785&r2=1491786&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/conn/ConnectTimeoutException.java (original)
+++ httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/conn/ConnectTimeoutException.java Tue Jun 11 13:15:43 2013
@@ -59,4 +59,9 @@ public class ConnectTimeoutException ext
super(message);
}
+ public ConnectTimeoutException(final String message, final Throwable cause) {
+ super(message);
+ initCause(cause);
+ }
+
}
Modified: httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/conn/scheme/PlainSocketFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/conn/scheme/PlainSocketFactory.java?rev=1491786&r1=1491785&r2=1491786&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/conn/scheme/PlainSocketFactory.java (original)
+++ httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/conn/scheme/PlainSocketFactory.java Tue Jun 11 13:15:43 2013
@@ -126,7 +126,8 @@ public class PlainSocketFactory implemen
sock.setSoTimeout(soTimeout);
sock.connect(remoteAddress, connTimeout);
} catch (SocketTimeoutException ex) {
- throw new ConnectTimeoutException("Connect to " + remoteAddress + " timed out");
+ throw new ConnectTimeoutException(
+ "Connect to " + remoteAddress + " timed out", ex);
}
return sock;
}
Modified: httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java?rev=1491786&r1=1491785&r2=1491786&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java (original)
+++ httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java Tue Jun 11 13:15:43 2013
@@ -413,7 +413,8 @@ public class SSLSocketFactory implements
sock.setSoTimeout(soTimeout);
sock.connect(remoteAddress, connTimeout);
} catch (SocketTimeoutException ex) {
- throw new ConnectTimeoutException("Connect to " + remoteAddress + " timed out");
+ throw new ConnectTimeoutException(
+ "Connect to " + remoteAddress + " timed out", ex);
}
String hostname;