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/16 18:28:04 UTC
svn commit: r1611072 -
/tomee/tomee/branches/tomee-1.7.x/server/openejb-client/src/main/java/org/apache/openejb/client/HttpConnectionFactory.java
Author: andygumbrecht
Date: Wed Jul 16 16:28:04 2014
New Revision: 1611072
URL: http://svn.apache.org/r1611072
Log:
Be more forgiving on read.
Modified:
tomee/tomee/branches/tomee-1.7.x/server/openejb-client/src/main/java/org/apache/openejb/client/HttpConnectionFactory.java
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-client/src/main/java/org/apache/openejb/client/HttpConnectionFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-client/src/main/java/org/apache/openejb/client/HttpConnectionFactory.java?rev=1611072&r1=1611071&r2=1611072&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-client/src/main/java/org/apache/openejb/client/HttpConnectionFactory.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-client/src/main/java/org/apache/openejb/client/HttpConnectionFactory.java Wed Jul 16 16:28:04 2014
@@ -60,7 +60,7 @@ public class HttpConnectionFactory imple
httpURLConnection = (HttpURLConnection) url.openConnection();
httpURLConnection.setDoOutput(true);
- final int timeout;
+ int timeout;
if (params.containsKey("connectTimeout")) {
timeout = Integer.parseInt(params.get("connectTimeout"));
} else {
@@ -70,9 +70,13 @@ public class HttpConnectionFactory imple
httpURLConnection.setConnectTimeout(timeout);
if (params.containsKey("readTimeout")) {
- httpURLConnection.setReadTimeout(Integer.parseInt(params.get("readTimeout")));
+ timeout = Integer.parseInt(params.get("readTimeout"));
+ } else {
+ timeout = 10000;
}
+ httpURLConnection.setReadTimeout(timeout);
+
if (params.containsKey("sslKeyStore") || params.containsKey("sslTrustStore")) {
try {
((HttpsURLConnection) httpURLConnection).setSSLSocketFactory(new SSLContextBuilder(params).build().getSocketFactory());