You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2014/02/24 17:27:03 UTC

git commit: CAMEL-7228: Fixed backport not compile.

Repository: camel
Updated Branches:
  refs/heads/camel-2.12.x 90685ddb3 -> 28d331cb7


CAMEL-7228: Fixed backport not compile.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/28d331cb
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/28d331cb
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/28d331cb

Branch: refs/heads/camel-2.12.x
Commit: 28d331cb7665a777e3147595940631597a8daafd
Parents: 90685dd
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Feb 24 17:28:51 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Feb 24 17:28:51 2014 +0100

----------------------------------------------------------------------
 .../java/org/apache/camel/component/http4/HttpComponent.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/28d331cb/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 485b1fa..1406968 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
@@ -261,9 +261,6 @@ public class HttpComponent extends HeaderFilterStrategyComponent {
         // configure the endpoint
         setProperties(endpoint, parameters);
 
-        // determine the portnumber (special case: default portnumber)
-        //int port = getPort(uriHttpUriAddress);
-
         // we can not change the port of an URI, we must create a new one with an explicit port value
         URI httpUri = URISupport.createRemainingURI(
                 new URI(uriHttpUriAddress.getScheme(),
@@ -295,6 +292,9 @@ public class HttpComponent extends HeaderFilterStrategyComponent {
         if (endpoint.getCookieStore() == null) {
             endpoint.setCookieStore(getCookieStore());
         }
+
+        // determine the portnumber (special case: default portnumber)
+        int port = getPort(uriHttpUriAddress);
         // register port on schema registry
         registerPort(secure, x509HostnameVerifier, port, sslContextParameters);