camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1404938 - in /camel/branches/camel-2.9.x: ./ components/camel-jetty/src/main/java/org/apache/camel/component/jetty/ components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ components/camel-jetty/src/test/resources/org/apache...
Date Fri, 02 Nov 2012 12:09:49 GMT
Author: davsclaus
Date: Fri Nov  2 12:09:49 2012
New Revision: 1404938

URL: http://svn.apache.org/viewvc?rev=1404938&view=rev
Log:
CAMEL-5766: Fixed issue with using jetty component with other name than jetty.

Added:
    camel/branches/camel-2.9.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyComponentSpringConfiguredTest.java
      - copied unchanged from r1404935, camel/branches/camel-2.10.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyComponentSpringConfiguredTest.java
    camel/branches/camel-2.9.x/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/JettyComponentSpringConfiguredTest.xml
      - copied unchanged from r1404935, camel/branches/camel-2.10.x/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/JettyComponentSpringConfiguredTest.xml
Modified:
    camel/branches/camel-2.9.x/   (props changed)
    camel/branches/camel-2.9.x/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1404934
  Merged /camel/branches/camel-2.10.x:r1404935

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

Modified: camel/branches/camel-2.9.x/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java?rev=1404938&r1=1404937&r2=1404938&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
(original)
+++ camel/branches/camel-2.9.x/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
Fri Nov  2 12:09:49 2012
@@ -194,7 +194,7 @@ public class JettyHttpComponent extends 
             httpClientParameters.remove(key);
         }
 
-        String address = uri.startsWith("jetty:") ? remaining : uri;
+        String address = remaining;
         URI addressUri = new URI(UnsafeUriCharactersEncoder.encode(address));
         URI endpointUri = URISupport.createRemainingURI(addressUri, CastUtils.cast(httpClientParameters));
         // restructure uri to be based on the parameters left as we dont want to include
the Camel internal options



Mime
View raw message