[jboss-svn-commits] JBL Code SVN: r38448 - labs/jbossesb/branches/JBESB_4_11_CP2/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap.

[jboss-svn-commits at lists.jboss.org]

Author: tcunning
Date: 2014-09-30 11:29:02 -0400 (Tue, 30 Sep 2014)
New Revision: 38448

Modified:
   labs/jbossesb/branches/JBESB_4_11_CP2/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/RemoteWsdlLoader.java
Log:
JBESB-3973
Add connection and socket timeout properties which are used to configure httpclient.


Modified: labs/jbossesb/branches/JBESB_4_11_CP2/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/RemoteWsdlLoader.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_11_CP2/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/RemoteWsdlLoader.java	2014-08-06 17:22:19 UTC (rev 38447)
+++ labs/jbossesb/branches/JBESB_4_11_CP2/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/RemoteWsdlLoader.java	2014-09-30 15:29:02 UTC (rev 38448)
@@ -53,12 +53,24 @@
 public class RemoteWsdlLoader {
 
     private static Logger logger = Logger.getLogger(RemoteWsdlLoader.class);
+
+    private static final String HTTP_SOCKET_TIMEOUT = "http.socket.timeout";
+    private static final String HTTP_CONNECTION_TIMEOUT = "http.connection.timeout";
+
     private HttpClient httpClient;
     private ConfigTree config;
 
     public RemoteWsdlLoader(Properties httpClientProps) throws ConfigurationException {
         httpClient = HttpClientFactory.createHttpClient(httpClientProps);
         this.config = generateConfig(httpClientProps);
+        
+        if (httpClientProps.containsKey(HTTP_SOCKET_TIMEOUT)) {
+        	httpClient.setTimeout(Integer.parseInt(httpClientProps.getProperty(HTTP_SOCKET_TIMEOUT)));
+        }
+        
+        if (httpClientProps.containsKey(HTTP_CONNECTION_TIMEOUT)) {
+        	httpClient.setConnectionTimeout(Integer.parseInt(httpClientProps.getProperty(HTTP_CONNECTION_TIMEOUT)));
+        }
     }
 
     public InputStream load(String url, String charsetNameOverride) throws IOException {
@@ -100,6 +112,7 @@
             httpMethod.setDoAuthentication(true);
 
             try {
+            
             	int result = httpClient.executeMethod(httpMethod);
 
                 if(result != HttpStatus.SC_OK) {