Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0D2BB106BC for ; Mon, 26 Aug 2013 15:14:30 +0000 (UTC) Received: (qmail 73701 invoked by uid 500); 26 Aug 2013 15:14:29 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 73575 invoked by uid 500); 26 Aug 2013 15:14:29 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 73559 invoked by uid 99); 26 Aug 2013 15:14:27 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Aug 2013 15:14:27 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1F3C48C55BE; Mon, 26 Aug 2013 15:14:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: davsclaus@apache.org To: commits@camel.apache.org Date: Mon, 26 Aug 2013 15:14:27 -0000 Message-Id: <0f650eb4ef0c46ee9c102334de3b5da3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: CAMEL-6605: Fixed using custom HttpClientConfigurer Updated Branches: refs/heads/camel-2.11.x 3e7978d1d -> a22ffb88f refs/heads/master 8434a5187 -> 9737301ba CAMEL-6605: Fixed using custom HttpClientConfigurer Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a22ffb88 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a22ffb88 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a22ffb88 Branch: refs/heads/camel-2.11.x Commit: a22ffb88f852ab12e3c611c2a18b2d6c7530f032 Parents: 3e7978d Author: Claus Ibsen Authored: Mon Aug 26 17:13:08 2013 +0200 Committer: Claus Ibsen Committed: Mon Aug 26 17:13:25 2013 +0200 ---------------------------------------------------------------------- .../org/apache/camel/component/http4/HttpComponent.java | 9 --------- 1 file changed, 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/a22ffb88/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java index 36b7aee..de82932 100644 --- a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java +++ b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java @@ -182,12 +182,6 @@ public class HttpComponent extends HeaderFilterStrategyComponent { httpBinding = resolveAndRemoveReferenceParameter(parameters, "httpBinding", HttpBinding.class); } - // TODO cmueller: remove the "httpClientConfigurerRef" look up in Camel 3.0 - HttpClientConfigurer httpClientConfigurer = resolveAndRemoveReferenceParameter(parameters, "httpClientConfigurerRef", HttpClientConfigurer.class); - if (httpClientConfigurer == null) { - httpClientConfigurer = resolveAndRemoveReferenceParameter(parameters, "httpClientConfigurer", HttpClientConfigurer.class); - } - // TODO cmueller: remove the "httpContextRef" look up in Camel 3.0 HttpContext httpContext = resolveAndRemoveReferenceParameter(parameters, "httpContextRef", HttpContext.class); if (httpContext == null) { @@ -273,9 +267,6 @@ public class HttpComponent extends HeaderFilterStrategyComponent { if (httpBinding != null) { endpoint.setHttpBinding(httpBinding); } - if (httpClientConfigurer != null) { - endpoint.setHttpClientConfigurer(httpClientConfigurer); - } if (httpMethodRestrict != null) { endpoint.setHttpMethodRestrict(httpMethodRestrict); }