camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject git commit: CAMEL-7679 Fixed the build error in camel-2.12.x
Date Tue, 12 Aug 2014 13:16:06 GMT
Repository: camel
Updated Branches:
  refs/heads/camel-2.12.x 87746aa60 -> 13b5793f7


CAMEL-7679 Fixed the build error in camel-2.12.x


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/13b5793f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/13b5793f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/13b5793f

Branch: refs/heads/camel-2.12.x
Commit: 13b5793f7f317a48fadfdd2deb63f84a03f91d54
Parents: 87746aa
Author: Willem Jiang <willem.jiang@gmail.com>
Authored: Tue Aug 12 21:15:18 2014 +0800
Committer: Willem Jiang <willem.jiang@gmail.com>
Committed: Tue Aug 12 21:15:43 2014 +0800

----------------------------------------------------------------------
 .../cxf/jaxrs/CxfRsConsumerWithBeanTest.java          | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/13b5793f/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerWithBeanTest.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerWithBeanTest.java
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerWithBeanTest.java
index 8d98975..e8d22d2 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerWithBeanTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerWithBeanTest.java
@@ -23,10 +23,10 @@ import org.apache.camel.component.cxf.CXFTestSupport;
 import org.apache.camel.component.cxf.jaxrs.testbean.ServiceUtil;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpPut;
 import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.util.EntityUtils;
 import org.junit.Test;
 
@@ -41,7 +41,7 @@ public class CxfRsConsumerWithBeanTest extends CamelTestSupport {
         return context;
     }
 
-    
+
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() {
@@ -52,19 +52,19 @@ public class CxfRsConsumerWithBeanTest extends CamelTestSupport {
 
     @Test
     public void testPutConsumer() throws Exception {
-        
+
         HttpPut put = new HttpPut("http://localhost:" + CXT + "/rest/customerservice/c20");
         StringEntity entity = new StringEntity("string");
         entity.setContentType("text/plain");
         put.setEntity(entity);
-        CloseableHttpClient httpclient = HttpClientBuilder.create().build();
+        HttpClient httpclient = new DefaultHttpClient();
 
         try {
             HttpResponse response = httpclient.execute(put);
             assertEquals(200, response.getStatusLine().getStatusCode());
             assertEquals("c20string", EntityUtils.toString(response.getEntity()));
         } finally {
-            httpclient.close();
+            httpclient.getConnectionManager().shutdown();
         }
     }
-}
\ No newline at end of file
+}


Mime
View raw message