Author: davsclaus
Date: Wed Dec 7 12:38:25 2011
New Revision: 1211415
URL: http://svn.apache.org/viewvc?rev=1211415&view=rev
Log:
CAMEL-4749: Ensure AsyncHttpClient is closed when stopping producer.
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcEndpoint.java
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 7 12:38:25 2011
@@ -1 +1 @@
-/camel/trunk:1202148,1202167,1202204-1202206,1202215,1202223,1202659,1202685,1203879,1203978,1204338,1205124,1205372,1205412,1205429,1205431,1205713,1206116,1206414,1207743,1207784,1208301,1208930,1208964-1208965,1209006-1209007,1209382,1209401,1209477,1209845-1209846,1210113,1210771,1210830,1211363
+/camel/trunk:1202148,1202167,1202204-1202206,1202215,1202223,1202659,1202685,1203879,1203978,1204338,1205124,1205372,1205412,1205429,1205431,1205713,1206116,1206414,1207743,1207784,1208301,1208930,1208964-1208965,1209006-1209007,1209382,1209401,1209477,1209845-1209846,1210113,1210771,1210830,1211363,1211414
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.8.x/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcEndpoint.java?rev=1211415&r1=1211414&r2=1211415&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcEndpoint.java
(original)
+++
camel/branches/camel-2.8.x/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcEndpoint.java
Wed Dec 7 12:38:25 2011
@@ -26,6 +26,7 @@ import org.apache.camel.Producer;
import org.apache.camel.impl.DefaultEndpoint;
import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.camel.spi.HeaderFilterStrategyAware;
+import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ObjectHelper;
/**
@@ -155,6 +156,10 @@ public class AhcEndpoint extends Default
@Override
protected void doStop() throws Exception {
super.doStop();
+ // ensure client is closed when stopping
+ if (client != null && !client.isClosed()) {
+ client.close();
+ }
client = null;
}