Repository: camel Updated Branches: refs/heads/master 882ce2622 -> 28d81a053
Revert "Fixed CS" This reverts commit 882ce262287aa9c599ee971c6701a31cee15753c. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c3961130 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c3961130 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c3961130 Branch: refs/heads/master Commit: c3961130c1a0d1695180b582b6b88b6a024ac5f8 Parents: 882ce26 Author: Andrea Cosentino <anco...@gmail.com> Authored: Tue Aug 2 14:52:45 2016 +0200 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Tue Aug 2 14:52:45 2016 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/camel/component/http4/HttpEndpoint.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/c3961130/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java index 3a5cc18..785940b 100644 --- a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java +++ b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java @@ -156,7 +156,7 @@ public class HttpEndpoint extends HttpCommonEndpoint { HttpHost proxy = new HttpHost(host, port, scheme); clientBuilder.setProxy(proxy); } else { - if (ObjectHelper.isNotEmpty(getProxyHost()) && ObjectHelper.isNotEmpty(getProxyPort())) { + if (ObjectHelper.isNotEmpty(getProxyHost()) && ObjectHelper.isNotEmpty(getProxyPort())) { String scheme = getProtocol(); // fallback and use either http or https depending on secure if (scheme == null) { @@ -164,7 +164,7 @@ public class HttpEndpoint extends HttpCommonEndpoint { } HttpHost proxy = new HttpHost(getProxyHost(), getProxyPort(), scheme); clientBuilder.setProxy(proxy); - } + } } } else { clientBuilder.useSystemProperties();
