Repository: camel Updated Branches: refs/heads/camel-2.18.x bb461ff34 -> 21e483db7
CAMEL-10704: XSLT will fail if the XML document contains a default namespace Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/21e483db Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/21e483db Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/21e483db Branch: refs/heads/camel-2.18.x Commit: 21e483db76be839ca6c58818b84b9e03e8d6db53 Parents: bb461ff Author: Stephan Siano <[email protected]> Authored: Fri Jan 13 13:43:00 2017 +0100 Committer: Stephan Siano <[email protected]> Committed: Fri Jan 13 13:50:27 2017 +0100 ---------------------------------------------------------------------- .../camel/converter/jaxp/StAX2SAXSource.java | 2 +- .../xslt/PayloadWithDefaultNamespaceTest.java | 40 ++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/21e483db/camel-core/src/main/java/org/apache/camel/converter/jaxp/StAX2SAXSource.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/converter/jaxp/StAX2SAXSource.java b/camel-core/src/main/java/org/apache/camel/converter/jaxp/StAX2SAXSource.java index ccb4366..2d4c847 100644 --- a/camel-core/src/main/java/org/apache/camel/converter/jaxp/StAX2SAXSource.java +++ b/camel-core/src/main/java/org/apache/camel/converter/jaxp/StAX2SAXSource.java @@ -135,7 +135,7 @@ public class StAX2SAXSource extends SAXSource implements XMLReader { case XMLStreamConstants.START_ELEMENT: { // namespaces for (int i = 0; i < streamReader.getNamespaceCount(); i++) { - String nsPrefix = streamReader.getNamespacePrefix(i); + String nsPrefix = nullToEmpty(streamReader.getNamespacePrefix(i)); String nsUri = nullToEmpty(streamReader.getNamespaceURI(i)); contentHandler.startPrefixMapping(nsPrefix, nsUri); } http://git-wip-us.apache.org/repos/asf/camel/blob/21e483db/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/PayloadWithDefaultNamespaceTest.java ---------------------------------------------------------------------- diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/PayloadWithDefaultNamespaceTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/PayloadWithDefaultNamespaceTest.java new file mode 100644 index 0000000..a82a8a3 --- /dev/null +++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/PayloadWithDefaultNamespaceTest.java @@ -0,0 +1,40 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.component.xslt; + +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.test.junit4.CamelTestSupport; +import org.junit.Test; + +public class PayloadWithDefaultNamespaceTest extends CamelTestSupport { + private static final String PAYLOAD = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><Message xmlns=\"http://www.camel.apache.org/envelope\";><Version>2.0</Version></Message>"; + + @Override + protected RouteBuilder createRouteBuilder() throws Exception { + return new RouteBuilder() { + @Override + public void configure() throws Exception { + from("direct:start").to("xslt:org/apache/camel/component/xslt/transform.xsl"); + } + }; + } + + @Test + public void testTransformWithDefaultNamespace() throws Exception { + template.sendBody("direct:start", PAYLOAD); + } +}
