svn commit: r1611074 - /tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/HttpConnectionFactory.java

[andygumbrecht]

Author: andygumbrecht
Date: Wed Jul 16 16:29:17 2014
New Revision: 1611074

URL: http://svn.apache.org/r1611074
Log:
Be more forgiving on read.

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=1611074&r1=1611073&r2=1611074&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
 Wed Jul 16 16:29:17 2014
@@ -53,14 +53,14 @@ public class HttpConnectionFactory imple
             final Map<String, String> params;
             try {
                 params = MulticastConnectionFactory.URIs.parseParamters(uri);
-            } catch (URISyntaxException e) {
+            } catch (final URISyntaxException e) {
                 throw new IllegalArgumentException("Invalid uri " + 
uri.toString(), e);
             }
 
             httpURLConnection = (HttpURLConnection) url.openConnection();
             httpURLConnection.setDoOutput(true);
 
-            final int timeout;
+            int timeout;
             if (params.containsKey("connectTimeout")) {
                 timeout = Integer.parseInt(params.get("connectTimeout"));
             } else {
@@ -70,15 +70,19 @@ 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());
-                } catch (NoSuchAlgorithmException e) {
+                } catch (final NoSuchAlgorithmException e) {
                     throw new ClientRuntimeException(e.getMessage(), e);
-                } catch (KeyManagementException e) {
+                } catch (final KeyManagementException e) {
                     throw new ClientRuntimeException(e.getMessage(), e);
                 }
             }
@@ -94,7 +98,7 @@ public class HttpConnectionFactory imple
         public void discard() {
             try {
                 close();
-            } catch (Exception e) {
+            } catch (final Exception e) {
                 //Ignore
             }
         }
@@ -110,14 +114,14 @@ public class HttpConnectionFactory imple
             if (inputStream != null) {
                 try {
                     inputStream.close();
-                } catch (IOException e) {
+                } catch (final IOException e) {
                     exception = e;
                 }
             }
             if (outputStream != null) {
                 try {
                     outputStream.close();
-                } catch (IOException e) {
+                } catch (final IOException e) {
                     if (exception == null) {
                         exception = e;
                     }