You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2017/04/12 19:43:24 UTC
[3/5] camel git commit: Fix CS
Fix CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1262a81a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1262a81a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1262a81a
Branch: refs/heads/master
Commit: 1262a81a16ef0b1063af579fde0152c963048233
Parents: 67ab9a9
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Wed Apr 12 16:33:17 2017 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Wed Apr 12 17:13:00 2017 -0230
----------------------------------------------------------------------
.../java/org/apache/camel/component/http4/HttpComponent.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/1262a81a/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 b465374..dd09fea 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
@@ -85,8 +85,6 @@ public class HttpComponent extends HttpCommonComponent implements RestProducerFa
+ " Important: Only one instance of org.apache.camel.util.jsse.SSLContextParameters is supported per HttpComponent."
+ " If you need to use 2 or more different instances, you need to define a new HttpComponent per instance you need.")
protected SSLContextParameters sslContextParameters;
- @Metadata(label = "security", defaultValue = "false")
- private boolean useGlobalSslContextParameters;
@Metadata(label = "security", description = "To use a custom X509HostnameVerifier such as DefaultHostnameVerifier or NoopHostnameVerifier.")
protected HostnameVerifier x509HostnameVerifier = new DefaultHostnameVerifier();
@Metadata(label = "producer", description = "To use a custom org.apache.http.client.CookieStore."
@@ -103,6 +101,8 @@ public class HttpComponent extends HttpCommonComponent implements RestProducerFa
// It's MILLISECONDS, the default value is always keep alive
@Metadata(label = "advanced", description = "The time for connection to live, the time unit is millisecond, the default value is always keep alive.")
protected long connectionTimeToLive = -1;
+ @Metadata(label = "security", defaultValue = "false")
+ private boolean useGlobalSslContextParameters;
public HttpComponent() {
super(HttpEndpoint.class);