Author: carnold
Date: Fri Oct 9 04:22:45 2009
New Revision: 823403
URL: http://svn.apache.org/viewvc?rev=823403&view=rev
Log:
Bug 47967: log4j.ignoreTCL not honored on Loader.getResource
Modified:
logging/log4j/trunk/src/changes/changes.xml
logging/log4j/trunk/src/main/java/org/apache/log4j/helpers/Loader.java
Modified: logging/log4j/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/trunk/src/changes/changes.xml?rev=823403&r1=823402&r2=823403&view=diff
==============================================================================
--- logging/log4j/trunk/src/changes/changes.xml (original)
+++ logging/log4j/trunk/src/changes/changes.xml Fri Oct 9 04:22:45 2009
@@ -82,6 +82,7 @@
<action action="fix" issue="46404">Failure when toString() of throwable
performs logging in SocketAppender, SocketHubAppender and JDBCAppender.</action>
<action action="fix" issue="47465">Reading configuration files from a
JAR locks the JAR file</action>
<action action="add" issue="38061">PropertyConfigurator does not
support configuring ErrorHandler.</action>
+ <action action="fix" issue="47967">log4j.ignoreTCL should apply to the
getResource method in addition to the loadClass method of
org.apache.log4j.helpers.Loader.</action>
</release>
Modified: logging/log4j/trunk/src/main/java/org/apache/log4j/helpers/Loader.java
URL:
http://svn.apache.org/viewvc/logging/log4j/trunk/src/main/java/org/apache/log4j/helpers/Loader.java?rev=823403&r1=823402&r2=823403&view=diff
==============================================================================
--- logging/log4j/trunk/src/main/java/org/apache/log4j/helpers/Loader.java
(original)
+++ logging/log4j/trunk/src/main/java/org/apache/log4j/helpers/Loader.java Fri
Oct 9 04:22:45 2009
@@ -90,7 +90,7 @@
URL url = null;
try {
- if(!java1) {
+ if(!java1 && !ignoreTCL) {
classLoader = getTCL();
if(classLoader != null) {
LogLog.debug("Trying to find ["+resource+"] using context
classloader "
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
