Author: rgoers
Date: Tue Jun 17 03:54:32 2014
New Revision: 1603048
URL: http://svn.apache.org/r1603048
Log:
LOG4J2-619 - correct bad fix
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java
logging/log4j/log4j2/trunk/src/changes/changes.xml
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=1603048&r1=1603047&r2=1603048&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
Tue Jun 17 03:54:32 2014
@@ -242,9 +242,7 @@ public class XmlConfiguration extends Ab
final ConfigurationFactory.ConfigurationSource source =
new ConfigurationFactory.ConfigurationSource(new
FileInputStream(configFile), configFile);
final XmlConfiguration config = new XmlConfiguration(source);
- if (config.rootElement == null) {
- return null;
- }
+ return (config.rootElement == null) ? null : config;
} catch (final FileNotFoundException ex) {
LOGGER.error("Cannot locate file " + configFile, ex);
}
Modified: logging/log4j/log4j2/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/changes/changes.xml?rev=1603048&r1=1603047&r2=1603048&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/changes/changes.xml (original)
+++ logging/log4j/log4j2/trunk/src/changes/changes.xml Tue Jun 17 03:54:32 2014
@@ -22,7 +22,7 @@
</properties>
<body>
<release version="2.0-rc2" date="2014-MM-DD" description="Bug fixes and
enhancements">
- <action issue="LOG4J2-619" dev="mattsicker" type="fix" due-to="Scott
Harrington">
+ <action issue="LOG4J2-619" dev="rgoers" type="fix" due-to="Scott
Harrington">
Invalid XML configuration files do not prevent the config file from
being checked again.
</action>
<action issue="LOG4J2-637" dev="rpopma" type="fix" due-to="Mansoor
Sajjad, Jon Wilmoth">
