Repository: logging-log4j2 Updated Branches: refs/heads/master 875f78b81 -> e0d0aee88
[LOG4J2-1125] Reuse StringBuilder to improve performance for PatternLayout and other String-based layouts: CSV, GELF, HTML, RFC524, Syslog. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/e0d0aee8 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/e0d0aee8 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/e0d0aee8 Branch: refs/heads/master Commit: e0d0aee88d38c9e8b5a31c60f10d98cd2078ce9d Parents: 875f78b Author: ggregory <[email protected]> Authored: Tue Sep 22 10:22:44 2015 -0700 Committer: ggregory <[email protected]> Committed: Tue Sep 22 10:22:44 2015 -0700 ---------------------------------------------------------------------- .../logging/log4j/core/config/xml/XmlConfiguration.java | 7 +++++++ 1 file changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e0d0aee8/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java index 808f3bc..6174939 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java @@ -102,6 +102,13 @@ public class XmlConfiguration extends AbstractConfiguration implements Reconfigu } catch (final NoSuchMethodError err) { // LOG4J2-919 LOGGER.warn("The DocumentBuilderFactory [{}] is out of date and does not support XInclude: {}", factory, err); + } catch (final Exception e) { + // LOG4J2-1127 + if (e.getCause() instanceof UnsupportedOperationException) { + LOGGER.warn("The DocumentBuilderFactory [{}] does not support XInclude: {}", factory, e); + } else { + throw e; + } } try { // Alternative: We could specify all features and values with system properties like:
