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 2023/06/09 10:41:14 UTC
[camel] branch camel-3.18.x updated: CAMEL-19415: camel-stax - Avoid NPE when woodstox has null key for default NS.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.18.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.18.x by this push:
new 8ce4f103cd5 CAMEL-19415: camel-stax - Avoid NPE when woodstox has null key for default NS.
8ce4f103cd5 is described below
commit 8ce4f103cd58839dd04afb677444429e3b8bf762
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Jun 9 12:40:21 2023 +0200
CAMEL-19415: camel-stax - Avoid NPE when woodstox has null key for default NS.
---
.../camel/language/xtokenizer/XMLTokenExpressionIterator.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/core/camel-xml-jaxp/src/main/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIterator.java b/core/camel-xml-jaxp/src/main/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIterator.java
index 14ac0564c4d..0c3d09e1fa2 100644
--- a/core/camel-xml-jaxp/src/main/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIterator.java
+++ b/core/camel-xml-jaxp/src/main/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIterator.java
@@ -393,8 +393,13 @@ public class XMLTokenExpressionIterator extends ExpressionAdapter implements Nam
sb.append(token, 0, stag.length() - (empty ? 2 : 1));
for (Entry<String, String> e : getCurrentNamespaceBindings().entrySet()) {
if (!skip.contains(e.getKey())) {
- sb.append(e.getKey().length() == 0 ? " xmlns" : " xmlns:")
- .append(e.getKey()).append("=").append(quote).append(e.getValue()).append(quote);
+ boolean defaultNS = e.getKey() == null || e.getKey().length() == 0;
+ if (defaultNS) {
+ sb.append(" xmlns").append("=").append(quote).append(e.getValue()).append(quote);
+ } else {
+ sb.append(" xmlns:")
+ .append(e.getKey()).append("=").append(quote).append(e.getValue()).append(quote);
+ }
}
}
sb.append(token, stag.length() - (empty ? 2 : 1), token.length());