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 2014/08/18 07:56:31 UTC
[1/2] git commit: CAMEL-7589: fix NPE
Repository: camel
Updated Branches:
refs/heads/master 8576a1fea -> e896fe520
CAMEL-7589: fix NPE
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/de13f934
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/de13f934
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/de13f934
Branch: refs/heads/master
Commit: de13f934ecb300a93d3fc311fbb2f1de50343400
Parents: fc4cbdb
Author: wuwen <wu...@gmail.com>
Authored: Mon Aug 18 00:07:06 2014 +0800
Committer: wuwen <wu...@gmail.com>
Committed: Mon Aug 18 00:07:06 2014 +0800
----------------------------------------------------------------------
.../org/apache/camel/impl/DefaultProducerTemplate.java | 12 ++++++++----
.../apache/camel/impl/DefaultProducerTemplateTest.java | 3 +++
2 files changed, 11 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/de13f934/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java
index 7f852f7..6a7cfd4 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java
@@ -233,8 +233,10 @@ public class DefaultProducerTemplate extends ServiceSupport implements ProducerT
Exchange result = send(endpoint, new Processor() {
public void process(Exchange exchange) {
Message in = exchange.getIn();
- for (Map.Entry<String, Object> header : headers.entrySet()) {
- in.setHeader(header.getKey(), header.getValue());
+ if (headers != null) {
+ for (Map.Entry<String, Object> header : headers.entrySet()) {
+ in.setHeader(header.getKey(), header.getValue());
+ }
}
in.setBody(body);
}
@@ -251,8 +253,10 @@ public class DefaultProducerTemplate extends ServiceSupport implements ProducerT
Exchange exchange = send(endpoint, pattern, new Processor() {
public void process(Exchange exchange) throws Exception {
Message in = exchange.getIn();
- for (Map.Entry<String, Object> header : headers.entrySet()) {
- in.setHeader(header.getKey(), header.getValue());
+ if (headers != null) {
+ for (Map.Entry<String, Object> header : headers.entrySet()) {
+ in.setHeader(header.getKey(), header.getValue());
+ }
}
in.setBody(body);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/de13f934/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerTemplateTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerTemplateTest.java b/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerTemplateTest.java
index ab966eb..8e5942b 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerTemplateTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerTemplateTest.java
@@ -198,6 +198,9 @@ public class DefaultProducerTemplateTest extends ContextTestSupport {
out = producer.requestBodyAndHeaders("Hello", headers);
assertEquals("Bye Bye World", out);
+ out = producer.requestBodyAndHeaders("Hello", null);
+ assertEquals("Bye Bye World", out);
+
producer.stop();
}
[2/2] git commit: Merge branch 'CAMEL-7589' of
https://github.com/wuwen5/camel
Posted by da...@apache.org.
Merge branch 'CAMEL-7589' of https://github.com/wuwen5/camel
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e896fe52
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e896fe52
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e896fe52
Branch: refs/heads/master
Commit: e896fe5202ff9685c5aa7a6f200401a97dea6817
Parents: 8576a1f de13f93
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Aug 18 07:55:15 2014 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Aug 18 07:55:15 2014 +0200
----------------------------------------------------------------------
.../org/apache/camel/impl/DefaultProducerTemplate.java | 12 ++++++++----
.../apache/camel/impl/DefaultProducerTemplateTest.java | 3 +++
2 files changed, 11 insertions(+), 4 deletions(-)
----------------------------------------------------------------------