Author: mattsicker
Date: Sun Jun 15 23:43:53 2014
New Revision: 1602778
URL: http://svn.apache.org/r1602778
Log:
Don't return a broken configuration in case of parse error.
- Related to LOG4J2-619.
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java?rev=1602778&r1=1602777&r2=1602778&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java
Sun Jun 15 23:43:53 2014
@@ -241,7 +241,10 @@ public class XmlConfiguration extends Ab
try {
final ConfigurationFactory.ConfigurationSource source =
new ConfigurationFactory.ConfigurationSource(new
FileInputStream(configFile), configFile);
- return new XmlConfiguration(source);
+ final XmlConfiguration config = new XmlConfiguration(source);
+ if (config.rootElement == null) {
+ return null;
+ }
} catch (final FileNotFoundException ex) {
LOGGER.error("Cannot locate file " + configFile, ex);
}
@@ -318,7 +321,7 @@ public class XmlConfiguration extends Ab
}
return attributes;
}
-
+
@Override
public String toString() {
final String path = configFile != null ? configFile.getAbsolutePath()
: "unknown";
