This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit fe0d1c91a6dbf48d2a2f0b7b81b70d90e04a9c48 Author: Otavio Rodolfo Piske <[email protected]> AuthorDate: Wed Jan 4 17:56:32 2023 +0100 (chores) camel-cxf: avoid risky unboxing --- .../apache/camel/component/cxf/common/header/CxfHeaderHelper.java | 4 +++- .../org/apache/camel/component/cxf/jaxws/DefaultCxfBinding.java | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/common/header/CxfHeaderHelper.java b/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/common/header/CxfHeaderHelper.java index 943ed38ca58..48ecf0a01bd 100644 --- a/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/common/header/CxfHeaderHelper.java +++ b/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/common/header/CxfHeaderHelper.java @@ -240,7 +240,9 @@ public final class CxfHeaderHelper { if (values.size() == 1) { return values.get(0); } - if (exchange.getProperty(CxfConstants.CAMEL_CXF_PROTOCOL_HEADERS_MERGED, Boolean.FALSE, Boolean.class)) { + final boolean headersMerged + = exchange.getProperty(CxfConstants.CAMEL_CXF_PROTOCOL_HEADERS_MERGED, Boolean.FALSE, Boolean.class); + if (headersMerged) { return String.join(", ", values); } return values; diff --git a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultCxfBinding.java b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultCxfBinding.java index 0d5abb73da3..890fcaae3c8 100644 --- a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultCxfBinding.java +++ b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultCxfBinding.java @@ -672,8 +672,10 @@ public class DefaultCxfBinding implements CxfBinding, HeaderFilterStrategyAware List<String> values = entry.getValue(); Object evalue; if (values.size() > 1) { - if (exchange.getProperty(CxfConstants.CAMEL_CXF_PROTOCOL_HEADERS_MERGED, Boolean.FALSE, - Boolean.class)) { + final Boolean headersMerged + = exchange.getProperty(CxfConstants.CAMEL_CXF_PROTOCOL_HEADERS_MERGED, Boolean.FALSE, + Boolean.class); + if (headersMerged) { StringBuilder sb = new StringBuilder(); for (Iterator<String> it = values.iterator(); it.hasNext();) { sb.append(it.next());
