Mailing-List: contact commits-help@camel.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@camel.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1383835 - in /camel/branches/camel-2.10.x: ./
 components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java
Date: Wed, 12 Sep 2012 08:11:31 -0000
To: commits@camel.apache.org
From: ningjiang@apache.org
Message-Id: <20120912081131.3440623888E3@eris.apache.org>

Author: ningjiang
Date: Wed Sep 12 08:11:30 2012
New Revision: 1383835

URL: http://svn.apache.org/viewvc?rev=1383835&view=rev
Log:
Merged revisions 1383824 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r1383824 | ningjiang | 2012-09-12 15:58:47 +0800 (Wed, 12 Sep 2012) | 1 line
  
  CAMEL-5595 Fixed the camel-http4 default proxy scheme issue
........

Modified:
    camel/branches/camel-2.10.x/   (props changed)
    camel/branches/camel-2.10.x/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1383824

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: camel/branches/camel-2.10.x/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java?rev=1383835&r1=1383834&r2=1383835&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java (original)
+++ camel/branches/camel-2.10.x/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java Wed Sep 12 08:11:30 2012
@@ -21,6 +21,7 @@ import java.net.URISyntaxException;
 
 import org.apache.camel.PollingConsumer;
 import org.apache.camel.Producer;
+import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.component.http4.helper.HttpHelper;
 import org.apache.camel.impl.DefaultPollingEndpoint;
 import org.apache.camel.spi.HeaderFilterStrategy;
@@ -130,8 +131,12 @@ public class HttpEndpoint extends Defaul
             if (scheme == null) {
                 scheme = HttpHelper.isSecureConnection(getEndpointUri()) ? "https4" : "http4";
             }
-
             LOG.debug("CamelContext properties http.proxyHost, http.proxyPort, and http.proxyScheme detected. Using http proxy host: {} port: {} scheme: {}", new Object[]{host, port, scheme});
+            try {
+                component.registerPort(HttpHelper.isSecureConnection(scheme), component.getX509HostnameVerifier(), port, component.getSslContextParameters());
+            } catch (Exception ex) {
+                throw new RuntimeCamelException(ex);
+            }
             HttpHost proxy = new HttpHost(host, port, scheme);
             answer.getParams().setParameter(ConnRoutePNames.DEFAULT_PROXY, proxy);
         }