Repository: camel Updated Branches: refs/heads/camel-2.16.x 28bbd8e61 -> 2427011db refs/heads/master 54cd88f55 -> b9d82f4d0
CAMEL-9282: Avoid NPE/IndexOutOfBounds in camel-cxf. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b9d82f4d Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b9d82f4d Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b9d82f4d Branch: refs/heads/master Commit: b9d82f4d07bf7a3327ec8f223bcb0bc0d483f130 Parents: 54cd88f Author: Claus Ibsen <davscl...@apache.org> Authored: Sun Nov 22 16:00:31 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sun Nov 22 16:00:31 2015 +0100 ---------------------------------------------------------------------- .../org/apache/camel/component/cxf/DefaultCxfBinding.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/b9d82f4d/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java index 5e705b0..fa85635 100644 --- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java +++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java @@ -548,12 +548,15 @@ public class DefaultCxfBinding implements CxfBinding, HeaderFilterStrategyAware } else { evalue = values; } - } else { + } else if (values.size() == 1) { evalue = values.get(0); + } else { + evalue = null; + } + if (evalue != null) { + camelHeaders.put(entry.getKey(), evalue); } - camelHeaders.put(entry.getKey(), evalue); } - } } }
