Author: ningjiang
Date: Fri May 21 02:32:23 2010
New Revision: 946854
URL: http://svn.apache.org/viewvc?rev=946854&view=rev
Log:
CAMEL-2743 merge the patch into camel-http4, and fix the String issue that
Claus spotted
Modified:
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java
Modified:
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java?rev=946854&r1=946853&r2=946854&view=diff
==============================================================================
---
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
(original)
+++
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
Fri May 21 02:32:23 2010
@@ -66,7 +66,7 @@ public class HttpProducer extends Defaul
// propagate headers as HTTP headers
for (Map.Entry<String, Object> entry : in.getHeaders().entrySet()) {
- String headerValue = (String) entry.getValue();
+ String headerValue = in.getHeader(entry.getKey(), String.class);
if (strategy != null &&
!strategy.applyFilterToCamelHeaders(entry.getKey(), headerValue, exchange)) {
method.addRequestHeader(entry.getKey(), headerValue);
}
Modified:
camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java?rev=946854&r1=946853&r2=946854&view=diff
==============================================================================
---
camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java
(original)
+++
camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java
Fri May 21 02:32:23 2010
@@ -70,13 +70,13 @@ public class HttpProducer extends Defaul
HeaderFilterStrategy strategy =
getEndpoint().getHeaderFilterStrategy();
// propagate headers as HTTP headers
- for (String headerName : in.getHeaders().keySet()) {
- String headerValue = in.getHeader(headerName, String.class);
- if (strategy != null &&
!strategy.applyFilterToCamelHeaders(headerName, headerValue, exchange)) {
- httpRequest.addHeader(headerName, headerValue);
+ for (Map.Entry<String, Object> entry : in.getHeaders().entrySet()) {
+ String headerValue = in.getHeader(entry.getKey(), String.class);
+ if (strategy != null &&
!strategy.applyFilterToCamelHeaders(entry.getKey(), headerValue, exchange)) {
+ httpRequest.addHeader(entry.getKey(), headerValue);
}
}
-
+
// lets store the result in the output message.
HttpResponse httpResponse = null;
try {
