Author: davsclaus
Date: Tue Feb 28 16:02:06 2012
New Revision: 1294709
URL: http://svn.apache.org/viewvc?rev=1294709&view=rev
Log:
CAMEL-4871: Fixed when using empty body and x-www-form content-type.
Modified:
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/DefaultHttpBinding.java
camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/DefaultHttpBinding.java
Modified:
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/DefaultHttpBinding.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/DefaultHttpBinding.java?rev=1294709&r1=1294708&r2=1294709&view=diff
==============================================================================
---
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/DefaultHttpBinding.java
(original)
+++
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/DefaultHttpBinding.java
Tue Feb 28 16:02:06 2012
@@ -177,17 +177,19 @@ public class DefaultHttpBinding implemen
}
// Push POST form params into the headers to retain compatibility
with DefaultHttpBinding
String body = message.getBody(String.class);
- for (String param : body.split("&")) {
- String[] pair = param.split("=", 2);
- if (pair.length == 2) {
- String name = URLDecoder.decode(pair[0], charset);
- String value = URLDecoder.decode(pair[1], charset);
- if (headerFilterStrategy != null
- &&
!headerFilterStrategy.applyFilterToExternalHeaders(name, value,
message.getExchange())) {
- HttpHelper.appendHeader(headers, name, value);
+ if (ObjectHelper.isNotEmpty(body)) {
+ for (String param : body.split("&")) {
+ String[] pair = param.split("=", 2);
+ if (pair.length == 2) {
+ String name = URLDecoder.decode(pair[0], charset);
+ String value = URLDecoder.decode(pair[1], charset);
+ if (headerFilterStrategy != null
+ &&
!headerFilterStrategy.applyFilterToExternalHeaders(name, value,
message.getExchange())) {
+ HttpHelper.appendHeader(headers, name, value);
+ }
+ } else {
+ throw new IllegalArgumentException("Invalid parameter,
expected to be a pair but was " + param);
}
- } else {
- throw new IllegalArgumentException("Invalid parameter,
expected to be a pair but was " + param);
}
}
}
Modified:
camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/DefaultHttpBinding.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/DefaultHttpBinding.java?rev=1294709&r1=1294708&r2=1294709&view=diff
==============================================================================
---
camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/DefaultHttpBinding.java
(original)
+++
camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/DefaultHttpBinding.java
Tue Feb 28 16:02:06 2012
@@ -162,17 +162,19 @@ public class DefaultHttpBinding implemen
}
// Push POST form params into the headers to retain compatibility
with DefaultHttpBinding
String body = message.getBody(String.class);
- for (String param : body.split("&")) {
- String[] pair = param.split("=", 2);
- if (pair.length == 2) {
- String name = URLDecoder.decode(pair[0], charset);
- String value = URLDecoder.decode(pair[1], charset);
- if (headerFilterStrategy != null
- &&
!headerFilterStrategy.applyFilterToExternalHeaders(name, value,
message.getExchange())) {
- headers.put(name, value);
+ if (ObjectHelper.isNotEmpty(body)) {
+ for (String param : body.split("&")) {
+ String[] pair = param.split("=", 2);
+ if (pair.length == 2) {
+ String name = URLDecoder.decode(pair[0], charset);
+ String value = URLDecoder.decode(pair[1], charset);
+ if (headerFilterStrategy != null
+ &&
!headerFilterStrategy.applyFilterToExternalHeaders(name, value,
message.getExchange())) {
+ headers.put(name, value);
+ }
+ } else {
+ throw new IllegalArgumentException("Invalid parameter,
expected to be a pair but was " + param);
}
- } else {
- throw new IllegalArgumentException("Invalid parameter,
expected to be a pair but was " + param);
}
}
}