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 14:54:40 UTC
svn commit: r1372865 - in /camel/branches/camel-2.10.x: ./
components/camel-ahc/src/main/java/org/apache/camel/component/ahc/helper/
components/camel-http/src/main/java/org/apache/camel/component/http/helper/
components/camel-http4/src/main/java/org/ap...
Author: davsclaus
Date: Tue Aug 14 12:54:39 2012
New Revision: 1372865
URL: http://svn.apache.org/viewvc?rev=1372865&view=rev
Log:
CAMEL-5504: Fixed briding endpoints when content path had spaces in the from or to uris
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/helper/AhcHelper.java
camel/branches/camel-2.10.x/components/camel-http/src/main/java/org/apache/camel/component/http/helper/HttpHelper.java
camel/branches/camel-2.10.x/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/HttpHelper.java
camel/branches/camel-2.10.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerBridgePathWithSpacesAtEndTest.java
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1372863
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.10.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.10.x/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/helper/AhcHelper.java?rev=1372865&r1=1372864&r2=1372865&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/helper/AhcHelper.java (original)
+++ camel/branches/camel-2.10.x/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/helper/AhcHelper.java Tue Aug 14 12:54:39 2012
@@ -30,6 +30,7 @@ import org.apache.camel.RuntimeExchangeE
import org.apache.camel.component.ahc.AhcEndpoint;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.URISupport;
+import org.apache.camel.util.UnsafeUriCharactersEncoder;
/**
*
@@ -157,6 +158,10 @@ public final class AhcHelper {
uri = uri.concat(path);
}
}
+
+ // ensure uri is encoded to be valid
+ uri = UnsafeUriCharactersEncoder.encode(uri);
+
return uri;
}
}
Modified: camel/branches/camel-2.10.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.10.x/components/camel-http/src/main/java/org/apache/camel/component/http/helper/HttpHelper.java?rev=1372865&r1=1372864&r2=1372865&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-http/src/main/java/org/apache/camel/component/http/helper/HttpHelper.java (original)
+++ camel/branches/camel-2.10.x/components/camel-http/src/main/java/org/apache/camel/component/http/helper/HttpHelper.java Tue Aug 14 12:54:39 2012
@@ -39,6 +39,7 @@ import org.apache.camel.converter.IOConv
import org.apache.camel.converter.stream.CachedOutputStream;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.UnsafeUriCharactersEncoder;
public final class HttpHelper {
@@ -207,6 +208,10 @@ public final class HttpHelper {
uri = uri.concat(path);
}
}
+
+ // ensure uri is encoded to be valid
+ uri = UnsafeUriCharactersEncoder.encode(uri);
+
return uri;
}
Modified: camel/branches/camel-2.10.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.10.x/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/HttpHelper.java?rev=1372865&r1=1372864&r2=1372865&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/HttpHelper.java (original)
+++ camel/branches/camel-2.10.x/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/HttpHelper.java Tue Aug 14 12:54:39 2012
@@ -38,6 +38,7 @@ import org.apache.camel.component.http4.
import org.apache.camel.converter.stream.CachedOutputStream;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.UnsafeUriCharactersEncoder;
import org.apache.http.HttpVersion;
import org.apache.http.ProtocolException;
@@ -208,6 +209,10 @@ public final class HttpHelper {
uri = uri.concat(path);
}
}
+
+ // ensure uri is encoded to be valid
+ uri = UnsafeUriCharactersEncoder.encode(uri);
+
return uri;
}
Modified: camel/branches/camel-2.10.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerBridgePathWithSpacesAtEndTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerBridgePathWithSpacesAtEndTest.java?rev=1372865&r1=1372864&r2=1372865&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerBridgePathWithSpacesAtEndTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerBridgePathWithSpacesAtEndTest.java Tue Aug 14 12:54:39 2012
@@ -40,6 +40,10 @@ public class JettyHttpProducerBridgePath
String reply = template.requestBody("jetty:http://0.0.0.0:" + port1 + "/foo ", "World", String.class);
assertEquals("Bye World", reply);
+
+ // and with more spaces
+ String reply2 = template.requestBody("jetty:http://0.0.0.0:" + port1 + "/foo /bar baz", "Camel", String.class);
+ assertEquals("Bye Camel", reply2);
}
@Override