Author: carnold
Date: Thu Aug 23 09:05:12 2007
New Revision: 569054
URL: http://svn.apache.org/viewvc?rev=569054&view=rev
Log:
Bug 43200: Log4JEntityResolver will return null if log4j.dtd can not be found
on classpath
Modified:
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/extras/DOMConfigurator.java
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=569054&r1=569053&r2=569054&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
Thu Aug 23 09:05:12 2007
@@ -50,6 +50,7 @@
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.FactoryConfigurationError;
+import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -1021,19 +1022,18 @@
*
* @author Paul Austin
* */
- private static class Log4jEntityResolver implements EntityResolver {
+ private static final class Log4jEntityResolver implements EntityResolver {
public InputSource resolveEntity (String publicId, String systemId) {
if (systemId.endsWith("log4j.dtd")) {
- Class clazz = getClass();
- InputStream in = clazz.getResourceAsStream("log4j.dtd");
+ InputStream in =
Log4jEntityResolver.class.getResourceAsStream("log4j.dtd");
if (in == null) {
- LogLog.error("Could not find [log4j.dtd]. Used [" +
clazz.getClassLoader()
+ LogLog.error("Could not find [log4j.dtd]. Used [" +
+ Log4jEntityResolver.class.getClassLoader()
+ "] class loader in the search.");
- return null;
- } else {
- return new InputSource(in);
+ in = new ByteArrayInputStream(new byte[0]);
}
+ return new InputSource(in);
} else {
return null;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
