You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2014/07/17 11:29:28 UTC
svn commit: r1611308 -
/tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/HttpConnectionFactory.java
Author: andygumbrecht
Date: Thu Jul 17 09:29:28 2014
New Revision: 1611308
URL: http://svn.apache.org/r1611308
Log:
Revert to default read timeout
Modified:
tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/HttpConnectionFactory.java
Modified: tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/HttpConnectionFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/HttpConnectionFactory.java?rev=1611308&r1=1611307&r2=1611308&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/HttpConnectionFactory.java (original)
+++ tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/HttpConnectionFactory.java Thu Jul 17 09:29:28 2014
@@ -60,7 +60,7 @@ public class HttpConnectionFactory imple
httpURLConnection = (HttpURLConnection) url.openConnection();
httpURLConnection.setDoOutput(true);
- int timeout;
+ final int timeout;
if (params.containsKey("connectTimeout")) {
timeout = Integer.parseInt(params.get("connectTimeout"));
} else {
@@ -70,13 +70,9 @@ public class HttpConnectionFactory imple
httpURLConnection.setConnectTimeout(timeout);
if (params.containsKey("readTimeout")) {
- timeout = Integer.parseInt(params.get("readTimeout"));
- } else {
- timeout = 10000;
+ httpURLConnection.setReadTimeout(Integer.parseInt(params.get("readTimeout")));
}
- httpURLConnection.setReadTimeout(timeout);
-
if (params.containsKey("sslKeyStore") || params.containsKey("sslTrustStore")) {
try {
((HttpsURLConnection) httpURLConnection).setSSLSocketFactory(new SSLContextBuilder(params).build().getSocketFactory());