[jboss-svn-commits] JBL Code SVN: r17802 - in labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product: services/soap/src/main/java/org/jboss/soa/esb/actions/soap and 1 other directory.

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

Author: kevin.conner at jboss.com
Date: 2008-01-14 04:58:56 -0500 (Mon, 14 Jan 2008)
New Revision: 17802

Modified:
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/http/HttpClientFactory.java
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPClient.java
Log:
Add cleanup for HttpClient: JBESB-1477

Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/http/HttpClientFactory.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/http/HttpClientFactory.java	2008-01-14 06:19:52 UTC (rev 17801)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/http/HttpClientFactory.java	2008-01-14 09:58:56 UTC (rev 17802)
@@ -108,5 +108,17 @@
         }
     }
 
-
+    /**
+     * Shutdown http client and associated connections.
+     * @param httpclient The http client
+     */
+    public static void shutdown(final HttpClient httpclient) {
+        if (httpclient != null) {
+            final HttpConnectionManager connectionManager = httpclient.getHttpConnectionManager();
+            if (connectionManager instanceof MultiThreadedHttpConnectionManager) {
+                final MultiThreadedHttpConnectionManager multiThreadedHttpConnectionManager = (MultiThreadedHttpConnectionManager)connectionManager;
+                multiThreadedHttpConnectionManager.shutdown();
+            }
+        }
+    }
 }

Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPClient.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPClient.java	2008-01-14 06:19:52 UTC (rev 17801)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPClient.java	2008-01-14 09:58:56 UTC (rev 17802)
@@ -320,6 +320,14 @@
         // Create the SoapUIInvoker instance for this SOAPClient...
         soapUIInvoker = new SoapUIInvoker();
     }
+    
+    @Override
+    public void destroy() throws ActionLifecycleException {
+        if (httpclient != null) {
+            HttpClientFactory.shutdown(httpclient);
+        }
+        super.destroy();
+    }
 
     private void extractHttpClientProps(ConfigTree config) {
         ConfigTree[] httpClientConfigTrees = config.getChildren("http-client-property");