Author: carnold
Date: Wed Jan 14 10:58:03 2009
New Revision: 734483
URL: http://svn.apache.org/viewvc?rev=734483&view=rev
Log:
Bug 45704: DOMConfigure.configure(URL) fails on JRE 1.5.0_16
Modified:
logging/log4j/trunk/src/changes/changes.xml
logging/log4j/trunk/src/main/java/org/apache/log4j/xml/DOMConfigurator.java
Modified: logging/log4j/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/trunk/src/changes/changes.xml?rev=734483&r1=734482&r2=734483&view=diff
==============================================================================
--- logging/log4j/trunk/src/changes/changes.xml (original)
+++ logging/log4j/trunk/src/changes/changes.xml Wed Jan 14 10:58:03 2009
@@ -73,6 +73,7 @@
<action action="fix" issue="46144">QuietWriter.write should check for
null argument.</action>
<action action="fix" issue="46512">LogFactor5 CategoryPath doesn't
replace slashes with dots.</action>
<action action="fix" issue="46163">LoggerDynamicMBean needs to handle a
null Appender name.</action>
+ <action action="fix" issue="45704">DOMConfigurator.configure(URL) fails
on JRE 1.5.0_16.</action>
</release>
Modified:
logging/log4j/trunk/src/main/java/org/apache/log4j/xml/DOMConfigurator.java
URL:
http://svn.apache.org/viewvc/logging/log4j/trunk/src/main/java/org/apache/log4j/xml/DOMConfigurator.java?rev=734483&r1=734482&r2=734483&view=diff
==============================================================================
--- logging/log4j/trunk/src/main/java/org/apache/log4j/xml/DOMConfigurator.java
(original)
+++ logging/log4j/trunk/src/main/java/org/apache/log4j/xml/DOMConfigurator.java
Wed Jan 14 10:58:03 2009
@@ -759,7 +759,9 @@
void doConfigure(final URL url, LoggerRepository repository) {
ParseAction action = new ParseAction() {
public Document parse(final DocumentBuilder parser) throws
SAXException, IOException {
- return parser.parse(url.toString());
+ InputSource src = new InputSource(url.openStream());
+ src.setSystemId(url.toString());
+ return parser.parse(src);
}
public String toString() {
return "url [" + url.toString() + "]";
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
