Updated Branches: refs/heads/master c5d5d6124 -> 36cf2763a
CAMEL-6474 doesn't use the DOM2SAX for XMLConverter any more Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/36cf2763 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/36cf2763 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/36cf2763 Branch: refs/heads/master Commit: 36cf2763ad55e4edc5c5cee8ee61e81a1db07e5f Parents: c5d5d61 Author: Willem Jiang <ningji...@apache.org> Authored: Fri Jun 21 16:21:06 2013 +0800 Committer: Willem Jiang <ningji...@apache.org> Committed: Fri Jun 21 16:21:55 2013 +0800 ---------------------------------------------------------------------- .../camel/converter/jaxp/XmlConverter.java | 34 +++----------------- 1 file changed, 4 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/36cf2763/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java index 9313a92..130f7de 100644 --- a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java +++ b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java @@ -79,26 +79,9 @@ public class XmlConverter { public static final String OUTPUT_PROPERTIES_PREFIX = "org.apache.camel.xmlconverter.output."; public static String defaultCharset = ObjectHelper.getSystemProperty(Exchange.DEFAULT_CHARSET_PROPERTY, "UTF-8"); - /* - * When converting a DOM tree to a SAXSource, we try to use Xalan internal DOM parser if - * available. Else, transform the DOM tree to a String and build a SAXSource on top of it. - */ - private static final Class<?> DOM_TO_SAX_CLASS; - private DocumentBuilderFactory documentBuilderFactory; private TransformerFactory transformerFactory; - static { - Class<?> cl = null; - try { - // will not warn the user if the class could not be found - cl = ObjectHelper.loadClass("org.apache.xalan.xsltc.trax.DOM2SAX", XmlConverter.class.getClassLoader(), false); - } catch (Exception e) { - // ignore - } - DOM_TO_SAX_CLASS = cl; - } - public XmlConverter() { } @@ -647,19 +630,10 @@ public class XmlConverter { @Converter public SAXSource toSAXSourceFromDOM(DOMSource source, Exchange exchange) throws TransformerException { - if (DOM_TO_SAX_CLASS != null) { - try { - Constructor<?> cns = DOM_TO_SAX_CLASS.getConstructor(Node.class); - XMLReader converter = (XMLReader) cns.newInstance(source.getNode()); - return new SAXSource(converter, new InputSource()); - } catch (Exception e) { - throw new TransformerException(e); - } - } else { - String str = toString(source, exchange); - StringReader reader = new StringReader(str); - return new SAXSource(new InputSource(reader)); - } + String str = toString(source, exchange); + StringReader reader = new StringReader(str); + return new SAXSource(new InputSource(reader)); + } @Converter
