From jboss-svn-commits at lists.jboss.org  Tue Sep 30 11:29:02 2014
From: jboss-svn-commits at lists.jboss.org (jboss-svn-commits at lists.jboss.org)
Date: Tue, 30 Sep 2014 11:29:02 -0400
Subject: [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.
Message-ID: <201409301529.s8UFT2nf001366@svn01.web.mwc.hst.phx2.redhat.com>

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) {


From jboss-svn-commits at lists.jboss.org  Tue Sep 30 15:57:16 2014
From: jboss-svn-commits at lists.jboss.org (jboss-svn-commits at lists.jboss.org)
Date: Tue, 30 Sep 2014 15:57:16 -0400
Subject: [jboss-svn-commits] JBL Code SVN: r38449 -
	labs/jbossesb/branches/JBESB_4_11_CP2/product.
Message-ID: <201409301957.s8UJvGDp005702@svn01.web.mwc.hst.phx2.redhat.com>

Author: tcunning
Date: 2014-09-30 15:57:15 -0400 (Tue, 30 Sep 2014)
New Revision: 38449

Modified:
   labs/jbossesb/branches/JBESB_4_11_CP2/product/ivy.xml
Log:
JBESB-3861
Upgraded commons-codec to 1.9 from 1.3.


Modified: labs/jbossesb/branches/JBESB_4_11_CP2/product/ivy.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_11_CP2/product/ivy.xml	2014-09-30 15:29:02 UTC (rev 38448)
+++ labs/jbossesb/branches/JBESB_4_11_CP2/product/ivy.xml	2014-09-30 19:57:15 UTC (rev 38449)
@@ -4,7 +4,7 @@
         <dependency org="javax.mail" name="mail" rev="1.4"/>
 
         <dependency org="asm" name="asm" rev="1.5.3"/>
-        <dependency org="commons-codec" name="commons-codec" rev="1.3"/>
+        <dependency org="commons-codec" name="commons-codec" rev="1.9"/>
         <dependency org="commons-collections" name="commons-collections" rev="3.2"/>
 	<dependency org="commons-net" name="commons-net" rev="2.0"/>	
 	


From jboss-svn-commits at lists.jboss.org  Tue Sep 30 16:38:31 2014
From: jboss-svn-commits at lists.jboss.org (jboss-svn-commits at lists.jboss.org)
Date: Tue, 30 Sep 2014 16:38:31 -0400
Subject: [jboss-svn-commits] JBL Code SVN: r38450 -
	labs/jbossesb/branches/JBESB_4_11_CP2/product/rosetta/src/org/jboss/soa/esb/message/mapping.
Message-ID: <201409302038.s8UKcVXd013343@svn01.web.mwc.hst.phx2.redhat.com>

Author: tcunning
Date: 2014-09-30 16:38:31 -0400 (Tue, 30 Sep 2014)
New Revision: 38450

Modified:
   labs/jbossesb/branches/JBESB_4_11_CP2/product/rosetta/src/org/jboss/soa/esb/message/mapping/ObjectMapper.java
Log:
JBESB-3974
Check debug level before doing log.debug.


Modified: labs/jbossesb/branches/JBESB_4_11_CP2/product/rosetta/src/org/jboss/soa/esb/message/mapping/ObjectMapper.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_11_CP2/product/rosetta/src/org/jboss/soa/esb/message/mapping/ObjectMapper.java	2014-09-30 19:57:15 UTC (rev 38449)
+++ labs/jbossesb/branches/JBESB_4_11_CP2/product/rosetta/src/org/jboss/soa/esb/message/mapping/ObjectMapper.java	2014-09-30 20:38:31 UTC (rev 38450)
@@ -280,7 +280,9 @@
         if (path.length==3) {
             object = MVEL.getProperty(path[2], object);
         }
-        logger.debug("expression=" + expression + " value=" + object);
+        if (logger.isDebugEnabled()) {
+            logger.debug("expression=" + expression + " value=" + object);
+        }
         return object;
     }
     /**