This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8073fde61d91a7d32669905ea10b9b0f649604dc Author: Claus Ibsen <[email protected]> AuthorDate: Mon Dec 17 13:39:33 2018 +0100 CAMEL-12994: Fixed issue in camel-saxon to skip reservered namespace prefix according to the XQuery spec. --- .../java/org/apache/camel/component/xquery/XQueryBuilder.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java b/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java index 179793f..8890a94 100644 --- a/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java +++ b/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java @@ -722,8 +722,13 @@ public abstract class XQueryBuilder implements Expression, Predicate, NamespaceA for (Map.Entry<String, String> entry : entries) { String prefix = entry.getKey(); String uri = entry.getValue(); - staticQueryContext.declareNamespace(prefix, uri); - staticQueryContext.setInheritNamespaces(true); + // skip invalid prefix or uri according to XQuery spec + boolean invalid = "xml".equals(prefix) || "xmlns".equals(prefix); + if (!invalid) { + LOG.debug("Declaring namespace [prefix: {}, uri: {}]", prefix, uri); + staticQueryContext.declareNamespace(prefix, uri); + staticQueryContext.setInheritNamespaces(true); + } } expression = createQueryExpression(staticQueryContext);
