This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push: new 5e35a92 CAMEL-15430: fix incorrect log placeholders 5e35a92 is described below commit 5e35a92893fa618bc06ba633f8fcec60e51e901d Author: Otavio Rodolfo Piske <opi...@redhat.com> AuthorDate: Thu Aug 20 08:51:06 2020 +0200 CAMEL-15430: fix incorrect log placeholders --- .../src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java | 6 +++--- .../org/apache/camel/support/builder/xml/XMLConverterHelper.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java b/core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java index 46c4ead..5edde17 100644 --- a/core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java +++ b/core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java @@ -1003,7 +1003,7 @@ public class XmlConverter { factory.setFeature(javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, true); } catch (TransformerConfigurationException e) { LOG.warn("TransformerFactory doesn't support the feature {} with value {}, due to {}.", - javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, "true", e); + javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, "true", e.getMessage()); } factory.setErrorListener(new XmlErrorListener()); configureSaxonTransformerFactory(factory); @@ -1056,13 +1056,13 @@ public class XmlConverter { sfactory.setFeature(javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, true); } catch (Exception e) { LOG.warn("SAXParser doesn't support the feature {} with value {}, due to {}.", - javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, "true", e); + javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, "true", e.getMessage()); } try { sfactory.setFeature("http://xml.org/sax/features/external-general-entities", false); } catch (Exception e) { LOG.warn("SAXParser doesn't support the feature {} with value {}, due to {}.", - new Object[] { "http://xml.org/sax/features/external-general-entities", false, e }); + new Object[] { "http://xml.org/sax/features/external-general-entities", false, e.getMessage() }); } sfactory.setNamespaceAware(true); return sfactory; diff --git a/core/camel-xml-jaxp/src/main/java/org/apache/camel/support/builder/xml/XMLConverterHelper.java b/core/camel-xml-jaxp/src/main/java/org/apache/camel/support/builder/xml/XMLConverterHelper.java index 9e4c853..73983e7 100644 --- a/core/camel-xml-jaxp/src/main/java/org/apache/camel/support/builder/xml/XMLConverterHelper.java +++ b/core/camel-xml-jaxp/src/main/java/org/apache/camel/support/builder/xml/XMLConverterHelper.java @@ -126,14 +126,14 @@ public class XMLConverterHelper { factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, Boolean.TRUE); } catch (ParserConfigurationException e) { LOG.warn("DocumentBuilderFactory doesn't support the feature {} with value {}, due to {}.", - new Object[] { XMLConstants.FEATURE_SECURE_PROCESSING, true, e }); + new Object[] { XMLConstants.FEATURE_SECURE_PROCESSING, true, e.getMessage() }); } try { // Disable the external-general-entities by default factory.setFeature("http://xml.org/sax/features/external-general-entities", false); } catch (ParserConfigurationException e) { LOG.warn("DocumentBuilderFactory doesn't support the feature {} with value {}, due to {}.", - new Object[] { "http://xml.org/sax/features/external-general-entities", false, e }); + new Object[] { "http://xml.org/sax/features/external-general-entities", false, e.getMessage() }); } // setup the SecurityManager by default if it's apache xerces try { @@ -145,7 +145,7 @@ public class XMLConverterHelper { } } catch (Exception e) { LOG.warn("DocumentBuilderFactory doesn't support the attribute {}, due to {}.", - new Object[] { "http://apache.org/xml/properties/security-manager", e }); + new Object[] { "http://apache.org/xml/properties/security-manager", e.getMessage() }); } // setup the feature from the system property setupFeatures(factory);