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 2012/08/14 12:45:03 UTC
svn commit: r1372835 - in /camel/branches/camel-2.9.x: ./
components/camel-ahc/src/main/java/org/apache/camel/component/ahc/
components/camel-ahc/src/main/java/org/apache/camel/component/ahc/helper/
components/camel-ahc/src/test/java/org/apache/camel/c...
Author: davsclaus
Date: Tue Aug 14 10:45:02 2012
New Revision: 1372835
URL: http://svn.apache.org/viewvc?rev=1372835&view=rev
Log:
CAMEL-5504: Fixed briding endpoints when content path had spaces in the from or to uris
Added:
camel/branches/camel-2.9.x/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcBridgeEndpointPathWithSpacesTest.java
- copied unchanged from r1372834, camel/branches/camel-2.10.x/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcBridgeEndpointPathWithSpacesTest.java
camel/branches/camel-2.9.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerBridgePathWithSpacesTest.java
- copied unchanged from r1372834, camel/branches/camel-2.10.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerBridgePathWithSpacesTest.java
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcComponent.java
camel/branches/camel-2.9.x/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/helper/AhcHelper.java
camel/branches/camel-2.9.x/components/camel-http/src/main/java/org/apache/camel/component/http/helper/HttpHelper.java
camel/branches/camel-2.9.x/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/HttpHelper.java
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1372833
Merged /camel/branches/camel-2.10.x:r1372834
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.9.x/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcComponent.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcComponent.java?rev=1372835&r1=1372834&r2=1372835&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcComponent.java (original)
+++ camel/branches/camel-2.9.x/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcComponent.java Tue Aug 14 10:45:02 2012
@@ -30,6 +30,7 @@ import org.apache.camel.impl.HeaderFilte
import org.apache.camel.util.CastUtils;
import org.apache.camel.util.IntrospectionSupport;
import org.apache.camel.util.URISupport;
+import org.apache.camel.util.UnsafeUriCharactersEncoder;
import org.apache.camel.util.jsse.SSLContextParameters;
import org.slf4j.Logger;
@@ -88,8 +89,9 @@ public class AhcComponent extends Header
endpoint.setClientConfig(builder.build());
}
-
- // restructure uri to be based on the parameters left as we don't want to include the Camel internal options
+
+ // restructure uri to be based on the parameters left as we dont want to include the Camel internal options
+ addressUri = UnsafeUriCharactersEncoder.encode(addressUri);
URI httpUri = URISupport.createRemainingURI(new URI(addressUri), CastUtils.cast(parameters));
endpoint.setHttpUri(httpUri);
Modified: camel/branches/camel-2.9.x/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/helper/AhcHelper.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/helper/AhcHelper.java?rev=1372835&r1=1372834&r2=1372835&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/helper/AhcHelper.java (original)
+++ camel/branches/camel-2.9.x/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/helper/AhcHelper.java Tue Aug 14 10:45:02 2012
@@ -135,7 +135,7 @@ public final class AhcHelper {
}
}
baseURI = new URI(baseURIString);
- String basePath = baseURI.getRawPath();
+ String basePath = baseURI.getPath();
if (path.startsWith(basePath)) {
path = path.substring(basePath.length());
if (path.startsWith("/")) {
Modified: camel/branches/camel-2.9.x/components/camel-http/src/main/java/org/apache/camel/component/http/helper/HttpHelper.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-http/src/main/java/org/apache/camel/component/http/helper/HttpHelper.java?rev=1372835&r1=1372834&r2=1372835&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-http/src/main/java/org/apache/camel/component/http/helper/HttpHelper.java (original)
+++ camel/branches/camel-2.9.x/components/camel-http/src/main/java/org/apache/camel/component/http/helper/HttpHelper.java Tue Aug 14 10:45:02 2012
@@ -185,7 +185,7 @@ public final class HttpHelper {
}
}
baseURI = new URI(baseURIString);
- String basePath = baseURI.getRawPath();
+ String basePath = baseURI.getPath();
if (path.startsWith(basePath)) {
path = path.substring(basePath.length());
if (path.startsWith("/")) {
Modified: camel/branches/camel-2.9.x/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/HttpHelper.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/HttpHelper.java?rev=1372835&r1=1372834&r2=1372835&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/HttpHelper.java (original)
+++ camel/branches/camel-2.9.x/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/HttpHelper.java Tue Aug 14 10:45:02 2012
@@ -185,7 +185,7 @@ public final class HttpHelper {
}
}
baseURI = new URI(baseURIString);
- String basePath = baseURI.getRawPath();
+ String basePath = baseURI.getPath();
if (path.startsWith(basePath)) {
path = path.substring(basePath.length());
if (path.startsWith("/")) {