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 2015/11/22 16:02:41 UTC
[1/2] camel git commit: CAMEL-9282: Avoid NPE/IndexOutOfBounds in
camel-cxf.
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 <da...@apache.org>
Authored: Sun Nov 22 16:00:31 2015 +0100
Committer: Claus Ibsen <da...@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);
}
-
}
}
}
[2/2] camel git commit: CAMEL-9282: Avoid NPE/IndexOutOfBounds in
camel-cxf.
Posted by da...@apache.org.
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/2427011d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2427011d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2427011d
Branch: refs/heads/camel-2.16.x
Commit: 2427011dba531e562c2e08dc41c80b5f0bc253fb
Parents: 28bbd8e
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Nov 22 16:00:31 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Nov 22 16:02:35 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/2427011d/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);
}
-
}
}
}