Author: carnold
Date: Wed Jan 14 11:02:49 2009
New Revision: 734485
URL: http://svn.apache.org/viewvc?rev=734485&view=rev
Log:
Bug 45704: DOMConfigure.configure(URL) fails on JRE 1.5.0_16
Modified:
logging/log4j/companions/extras/trunk/src/changes/changes.xml
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/extras/DOMConfigurator.java
Modified: logging/log4j/companions/extras/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/changes/changes.xml?rev=734485&r1=734484&r2=734485&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/changes/changes.xml (original)
+++ logging/log4j/companions/extras/trunk/src/changes/changes.xml Wed Jan 14
11:02:49 2009
@@ -24,6 +24,7 @@
<action action="fix" issue="43312">Mangled
source-repository.html</action>
<action action="fix" issue="44899">Extra NPE error message when using
missing appender class with DOMConfigurator.</action>
<action action="fix" issue="46046">Track changes of default timezone in
EnhancedPatternLayout's %d conversion pattern.</action>
+ <action action="fix" issue="45704">DOMConfigurator.configure(URL) fails
on JRE 1.5.0_16.</action>
</release>
Modified:
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/extras/DOMConfigurator.java
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/extras/DOMConfigurator.java?rev=734485&r1=734484&r2=734485&view=diff
==============================================================================
---
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/extras/DOMConfigurator.java
(original)
+++
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/extras/DOMConfigurator.java
Wed Jan 14 11:02:49 2009
@@ -671,7 +671,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]