svn commit: r1065381 - /camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java

[cmueller]

Author: cmueller
Date: Sun Jan 30 20:51:31 2011
New Revision: 1065381

URL: http://svn.apache.org/viewvc?rev=1065381&view=rev
Log:
CAMEL-3585: Upgrade to Apache HttpClients 4.1

Modified:
    
camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java

Modified: 
camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java?rev=1065381&r1=1065380&r2=1065381&view=diff
==============================================================================
--- 
camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
 (original)
+++ 
camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
 Sun Jan 30 20:51:31 2011
@@ -168,7 +168,10 @@ public class HttpComponent extends Heade
             httpClientConfigurer = 
resolveAndRemoveReferenceParameter(parameters, "httpClientConfigurer", 
HttpClientConfigurer.class);
         }
         
-        x509HostnameVerifier = resolveAndRemoveReferenceParameter(parameters, 
"x509HostnameVerifier", X509HostnameVerifier.class);
+        X509HostnameVerifier x509HostnameVerifier = 
resolveAndRemoveReferenceParameter(parameters, "x509HostnameVerifier", 
X509HostnameVerifier.class);
+        if (x509HostnameVerifier == null) {
+            x509HostnameVerifier = this.x509HostnameVerifier;
+        }
         
         // create the configurer to use for this endpoint
         HttpClientConfigurer configurer = 
createHttpClientConfigurer(parameters);
@@ -226,8 +229,7 @@ public class HttpComponent extends Heade
             // must register both https and https4
             SSLSocketFactory socketFactory = 
SSLSocketFactory.getSocketFactory();
             socketFactory.setHostnameVerifier(x509HostnameVerifier);
-            registry.register(new Scheme("https4", port, socketFactory));
-            registry.register(new Scheme("https", port, 
SSLSocketFactory.getSocketFactory()));
+            registry.register(new Scheme("https", port, socketFactory));
             LOG.info("Registering SSL scheme https on port " + port);
             
             socketFactory = SSLSocketFactory.getSocketFactory();